Skip to content

Commit 3870692

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81983 from carlory/fix-test-04
use log functions of core framework in the 'test/e2e/storage/*'
2 parents e60fd89 + 910bd00 commit 3870692

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+361
-410
lines changed

‎test/e2e/storage/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ go_library(
6565
"//test/e2e/framework:go_default_library",
6666
"//test/e2e/framework/auth:go_default_library",
6767
"//test/e2e/framework/deployment:go_default_library",
68-
"//test/e2e/framework/log:go_default_library",
6968
"//test/e2e/framework/metrics:go_default_library",
7069
"//test/e2e/framework/node:go_default_library",
7170
"//test/e2e/framework/pod:go_default_library",

‎test/e2e/storage/csi_mock_volume.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"k8s.io/apimachinery/pkg/util/wait"
3737
clientset "k8s.io/client-go/kubernetes"
3838
"k8s.io/kubernetes/test/e2e/framework"
39-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
4039
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4140
"k8s.io/kubernetes/test/e2e/storage/drivers"
4241
"k8s.io/kubernetes/test/e2e/storage/testsuites"
@@ -480,7 +479,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
480479

481480
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
482481
if pvcSize.Cmp(newSize) != 0 {
483-
e2elog.Failf("error updating pvc size %q", pvc.Name)
482+
framework.Failf("error updating pvc size %q", pvc.Name)
484483
}
485484
if test.expectFailure {
486485
err = testsuites.WaitForResizingCondition(pvc, m.cs, csiResizingConditionWait)
@@ -572,7 +571,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
572571

573572
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
574573
if pvcSize.Cmp(newSize) != 0 {
575-
e2elog.Failf("error updating pvc size %q", pvc.Name)
574+
framework.Failf("error updating pvc size %q", pvc.Name)
576575
}
577576

578577
ginkgo.By("Waiting for persistent volume resize to finish")
@@ -741,7 +740,7 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
741740
if err != nil {
742741
return fmt.Errorf("could not load CSI driver logs: %s", err)
743742
}
744-
e2elog.Logf("CSI driver logs:\n%s", log)
743+
framework.Logf("CSI driver logs:\n%s", log)
745744
// Find NodePublish in the logs
746745
foundAttributes := sets.NewString()
747746
logLines := strings.Split(log, "\n")
@@ -762,7 +761,7 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
762761
var call MockCSICall
763762
err := json.Unmarshal([]byte(line), &call)
764763
if err != nil {
765-
e2elog.Logf("Could not parse CSI driver log line %q: %s", line, err)
764+
framework.Logf("Could not parse CSI driver log line %q: %s", line, err)
766765
continue
767766
}
768767
switch call.Method {
@@ -774,12 +773,12 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
774773
vv, found := call.Request.VolumeContext[k]
775774
if found && v == vv {
776775
foundAttributes.Insert(k)
777-
e2elog.Logf("Found volume attribute %s: %s", k, v)
776+
framework.Logf("Found volume attribute %s: %s", k, v)
778777
}
779778
}
780779
}
781780
case "/csi.v1.Node/NodeUnpublishVolume":
782-
e2elog.Logf("Found NodeUnpublishVolume: %+v", call)
781+
framework.Logf("Found NodeUnpublishVolume: %+v", call)
783782
numNodeUnpublishVolume++
784783
}
785784
}
@@ -801,7 +800,7 @@ func checkPodLogs(cs clientset.Interface, namespace, driverPodName, driverContai
801800
func waitForCSIDriver(cs clientset.Interface, driverName string) error {
802801
timeout := 4 * time.Minute
803802

804-
e2elog.Logf("waiting up to %v for CSIDriver %q", timeout, driverName)
803+
framework.Logf("waiting up to %v for CSIDriver %q", timeout, driverName)
805804
for start := time.Now(); time.Since(start) < timeout; time.Sleep(framework.Poll) {
806805
_, err := cs.StorageV1beta1().CSIDrivers().Get(driverName, metav1.GetOptions{})
807806
if !errors.IsNotFound(err) {
@@ -814,9 +813,9 @@ func waitForCSIDriver(cs clientset.Interface, driverName string) error {
814813
func destroyCSIDriver(cs clientset.Interface, driverName string) {
815814
driverGet, err := cs.StorageV1beta1().CSIDrivers().Get(driverName, metav1.GetOptions{})
816815
if err == nil {
817-
e2elog.Logf("deleting %s.%s: %s", driverGet.TypeMeta.APIVersion, driverGet.TypeMeta.Kind, driverGet.ObjectMeta.Name)
816+
framework.Logf("deleting %s.%s: %s", driverGet.TypeMeta.APIVersion, driverGet.TypeMeta.Kind, driverGet.ObjectMeta.Name)
818817
// Uncomment the following line to get full dump of CSIDriver object
819-
// e2elog.Logf("%s", framework.PrettyPrint(driverGet))
818+
// framework.Logf("%s", framework.PrettyPrint(driverGet))
820819
cs.StorageV1beta1().CSIDrivers().Delete(driverName, nil)
821820
}
822821
}

‎test/e2e/storage/drivers/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ go_library(
2424
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2525
"//test/e2e/framework:go_default_library",
2626
"//test/e2e/framework/auth:go_default_library",
27-
"//test/e2e/framework/log:go_default_library",
2827
"//test/e2e/framework/pod:go_default_library",
2928
"//test/e2e/framework/volume:go_default_library",
3029
"//test/e2e/storage/testpatterns:go_default_library",

‎test/e2e/storage/drivers/csi.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
4848
"k8s.io/apimachinery/pkg/util/sets"
4949
"k8s.io/kubernetes/test/e2e/framework"
50-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
5150
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
5251
"k8s.io/kubernetes/test/e2e/storage/testsuites"
5352
"k8s.io/kubernetes/test/e2e/storage/utils"
@@ -187,7 +186,7 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*testsuites.Per
187186
},
188187
h.manifests...)
189188
if err != nil {
190-
e2elog.Failf("deploying %s driver: %v", h.driverInfo.Name, err)
189+
framework.Failf("deploying %s driver: %v", h.driverInfo.Name, err)
191190
}
192191

193192
return config, func() {
@@ -333,7 +332,7 @@ func (m *mockCSIDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTest
333332
},
334333
m.manifests...)
335334
if err != nil {
336-
e2elog.Failf("deploying csi mock driver: %v", err)
335+
framework.Failf("deploying csi mock driver: %v", err)
337336
}
338337

339338
return config, func() {
@@ -456,7 +455,7 @@ func (g *gcePDCSIDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTes
456455

457456
cleanup, err := f.CreateFromManifests(nil, manifests...)
458457
if err != nil {
459-
e2elog.Failf("deploying csi gce-pd driver: %v", err)
458+
framework.Failf("deploying csi gce-pd driver: %v", err)
460459
}
461460

462461
return &testsuites.PerTestConfig{

‎test/e2e/storage/drivers/csi_objects.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,20 @@ import (
3333

3434
clientset "k8s.io/client-go/kubernetes"
3535
"k8s.io/kubernetes/test/e2e/framework"
36-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3736
)
3837

3938
func shredFile(filePath string) {
4039
if _, err := os.Stat(filePath); os.IsNotExist(err) {
41-
e2elog.Logf("File %v was not found, skipping shredding", filePath)
40+
framework.Logf("File %v was not found, skipping shredding", filePath)
4241
return
4342
}
44-
e2elog.Logf("Shredding file %v", filePath)
43+
framework.Logf("Shredding file %v", filePath)
4544
_, _, err := framework.RunCmd("shred", "--remove", filePath)
4645
if err != nil {
47-
e2elog.Logf("Failed to shred file %v: %v", filePath, err)
46+
framework.Logf("Failed to shred file %v: %v", filePath, err)
4847
}
4948
if _, err := os.Stat(filePath); os.IsNotExist(err) {
50-
e2elog.Logf("File %v successfully shredded", filePath)
49+
framework.Logf("File %v successfully shredded", filePath)
5150
return
5251
}
5352
// Shred failed Try to remove the file for good meausure
@@ -67,13 +66,13 @@ func createGCESecrets(client clientset.Interface, ns string) {
6766

6867
premadeSAFile, ok := os.LookupEnv(saEnv)
6968
if !ok {
70-
e2elog.Logf("Could not find env var %v, please either create cloud-sa"+
69+
framework.Logf("Could not find env var %v, please either create cloud-sa"+
7170
" secret manually or rerun test after setting %v to the filepath of"+
7271
" the GCP Service Account to give to the GCE Persistent Disk CSI Driver", saEnv, saEnv)
7372
return
7473
}
7574

76-
e2elog.Logf("Found CI service account key at %v", premadeSAFile)
75+
framework.Logf("Found CI service account key at %v", premadeSAFile)
7776
// Need to copy it saFile
7877
stdout, stderr, err := framework.RunCmd("cp", premadeSAFile, saFile)
7978
framework.ExpectNoError(err, "error copying service account key: %s\nstdout: %s\nstderr: %s", err, stdout, stderr)

‎test/e2e/storage/drivers/in_tree.go‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
"k8s.io/apiserver/pkg/authentication/serviceaccount"
5656
"k8s.io/kubernetes/test/e2e/framework"
5757
"k8s.io/kubernetes/test/e2e/framework/auth"
58-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
5958
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
6059
"k8s.io/kubernetes/test/e2e/framework/volume"
6160
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
@@ -203,7 +202,7 @@ func (n *nfsDriver) CreateVolume(config *testsuites.PerTestConfig, volType testp
203202
case testpatterns.DynamicPV:
204203
// Do nothing
205204
default:
206-
e2elog.Failf("Unsupported volType:%v is specified", volType)
205+
framework.Failf("Unsupported volType:%v is specified", volType)
207206
}
208207
return nil
209208
}
@@ -315,18 +314,18 @@ func (v *glusterVolume) DeleteVolume() {
315314

316315
name := v.prefix + "-server"
317316

318-
e2elog.Logf("Deleting Gluster endpoints %q...", name)
317+
framework.Logf("Deleting Gluster endpoints %q...", name)
319318
err := cs.CoreV1().Endpoints(ns.Name).Delete(name, nil)
320319
if err != nil {
321320
if !errors.IsNotFound(err) {
322-
e2elog.Failf("Gluster delete endpoints failed: %v", err)
321+
framework.Failf("Gluster delete endpoints failed: %v", err)
323322
}
324-
e2elog.Logf("Gluster endpoints %q not found, assuming deleted", name)
323+
framework.Logf("Gluster endpoints %q not found, assuming deleted", name)
325324
}
326-
e2elog.Logf("Deleting Gluster server pod %q...", v.serverPod.Name)
325+
framework.Logf("Deleting Gluster server pod %q...", v.serverPod.Name)
327326
err = e2epod.DeletePodWithWait(cs, v.serverPod)
328327
if err != nil {
329-
e2elog.Failf("Gluster server pod delete failed: %v", err)
328+
framework.Failf("Gluster server pod delete failed: %v", err)
330329
}
331330
}
332331

@@ -1069,7 +1068,7 @@ func (c *cinderDriver) CreateVolume(config *testsuites.PerTestConfig, volType te
10691068
ginkgo.By("creating a test Cinder volume")
10701069
output, err := exec.Command("cinder", "create", "--display-name="+volumeName, "1").CombinedOutput()
10711070
outputString := string(output[:])
1072-
e2elog.Logf("cinder output:\n%s", outputString)
1071+
framework.Logf("cinder output:\n%s", outputString)
10731072
framework.ExpectNoError(err)
10741073

10751074
// Parse 'id'' from stdout. Expected format:
@@ -1089,7 +1088,7 @@ func (c *cinderDriver) CreateVolume(config *testsuites.PerTestConfig, volType te
10891088
volumeID = fields[3]
10901089
break
10911090
}
1092-
e2elog.Logf("Volume ID: %s", volumeID)
1091+
framework.Logf("Volume ID: %s", volumeID)
10931092
framework.ExpectNotEqual(volumeID, "")
10941093
return &cinderVolume{
10951094
volumeName: volumeName,
@@ -1106,16 +1105,16 @@ func (v *cinderVolume) DeleteVolume() {
11061105
var err error
11071106
timeout := time.Second * 120
11081107

1109-
e2elog.Logf("Waiting up to %v for removal of cinder volume %s", timeout, name)
1108+
framework.Logf("Waiting up to %v for removal of cinder volume %s", timeout, name)
11101109
for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) {
11111110
output, err = exec.Command("cinder", "delete", name).CombinedOutput()
11121111
if err == nil {
1113-
e2elog.Logf("Cinder volume %s deleted", name)
1112+
framework.Logf("Cinder volume %s deleted", name)
11141113
return
11151114
}
1116-
e2elog.Logf("Failed to delete volume %s: %v", name, err)
1115+
framework.Logf("Failed to delete volume %s: %v", name, err)
11171116
}
1118-
e2elog.Logf("Giving up deleting volume %s: %v\n%s", name, err, string(output[:]))
1117+
framework.Logf("Giving up deleting volume %s: %v\n%s", name, err, string(output[:]))
11191118
}
11201119

11211120
// GCE
@@ -1786,7 +1785,7 @@ func (l *localDriver) CreateVolume(config *testsuites.PerTestConfig, volType tes
17861785
ltr: l.ltrMgr.Create(node, l.volumeType, nil),
17871786
}
17881787
default:
1789-
e2elog.Failf("Unsupported volType: %v is specified", volType)
1788+
framework.Failf("Unsupported volType: %v is specified", volType)
17901789
}
17911790
return nil
17921791
}
@@ -1798,11 +1797,11 @@ func (v *localVolume) DeleteVolume() {
17981797
func (l *localDriver) nodeAffinityForNode(node *v1.Node) *v1.VolumeNodeAffinity {
17991798
nodeKey := "kubernetes.io/hostname"
18001799
if node.Labels == nil {
1801-
e2elog.Failf("Node does not have labels")
1800+
framework.Failf("Node does not have labels")
18021801
}
18031802
nodeValue, found := node.Labels[nodeKey]
18041803
if !found {
1805-
e2elog.Failf("Node does not have required label %q", nodeKey)
1804+
framework.Failf("Node does not have required label %q", nodeKey)
18061805
}
18071806
return &v1.VolumeNodeAffinity{
18081807
Required: &v1.NodeSelector{

‎test/e2e/storage/empty_dir_wrapper.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/util/intstr"
2727
"k8s.io/apimachinery/pkg/util/uuid"
2828
"k8s.io/kubernetes/test/e2e/framework"
29-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3029
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3130
"k8s.io/kubernetes/test/e2e/storage/utils"
3231
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -79,7 +78,7 @@ var _ = utils.SIGDescribe("EmptyDir wrapper volumes", func() {
7978

8079
var err error
8180
if secret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(secret); err != nil {
82-
e2elog.Failf("unable to create test secret %s: %v", secret.Name, err)
81+
framework.Failf("unable to create test secret %s: %v", secret.Name, err)
8382
}
8483

8584
configMapVolumeName := "configmap-volume"
@@ -96,7 +95,7 @@ var _ = utils.SIGDescribe("EmptyDir wrapper volumes", func() {
9695
}
9796

9897
if configMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Create(configMap); err != nil {
99-
e2elog.Failf("unable to create test configMap %s: %v", configMap.Name, err)
98+
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
10099
}
101100

102101
pod := &v1.Pod{
@@ -148,15 +147,15 @@ var _ = utils.SIGDescribe("EmptyDir wrapper volumes", func() {
148147
defer func() {
149148
ginkgo.By("Cleaning up the secret")
150149
if err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Delete(secret.Name, nil); err != nil {
151-
e2elog.Failf("unable to delete secret %v: %v", secret.Name, err)
150+
framework.Failf("unable to delete secret %v: %v", secret.Name, err)
152151
}
153152
ginkgo.By("Cleaning up the configmap")
154153
if err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Delete(configMap.Name, nil); err != nil {
155-
e2elog.Failf("unable to delete configmap %v: %v", configMap.Name, err)
154+
framework.Failf("unable to delete configmap %v: %v", configMap.Name, err)
156155
}
157156
ginkgo.By("Cleaning up the pod")
158157
if err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(pod.Name, metav1.NewDeleteOptions(0)); err != nil {
159-
e2elog.Failf("unable to delete pod %v: %v", pod.Name, err)
158+
framework.Failf("unable to delete pod %v: %v", pod.Name, err)
160159
}
161160
}()
162161
})
@@ -254,17 +253,17 @@ func createGitServer(f *framework.Framework) (gitURL string, gitRepo string, cle
254253
}
255254

256255
if gitServerSvc, err = f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(gitServerSvc); err != nil {
257-
e2elog.Failf("unable to create test git server service %s: %v", gitServerSvc.Name, err)
256+
framework.Failf("unable to create test git server service %s: %v", gitServerSvc.Name, err)
258257
}
259258

260259
return "http://" + gitServerSvc.Spec.ClusterIP + ":" + strconv.Itoa(httpPort), "test", func() {
261260
ginkgo.By("Cleaning up the git server pod")
262261
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(gitServerPod.Name, metav1.NewDeleteOptions(0)); err != nil {
263-
e2elog.Failf("unable to delete git server pod %v: %v", gitServerPod.Name, err)
262+
framework.Failf("unable to delete git server pod %v: %v", gitServerPod.Name, err)
264263
}
265264
ginkgo.By("Cleaning up the git server svc")
266265
if err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Delete(gitServerSvc.Name, nil); err != nil {
267-
e2elog.Failf("unable to delete git server svc %v: %v", gitServerSvc.Name, err)
266+
framework.Failf("unable to delete git server svc %v: %v", gitServerSvc.Name, err)
268267
}
269268
}
270269
}

‎test/e2e/storage/ephemeral_volume.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/util/rand"
2727
clientset "k8s.io/client-go/kubernetes"
2828
"k8s.io/kubernetes/test/e2e/framework"
29-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3029
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3130
"k8s.io/kubernetes/test/e2e/storage/utils"
3231
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -60,7 +59,7 @@ var _ = utils.SIGDescribe("Ephemeralstorage", func() {
6059

6160
// Allow it to sleep for 30 seconds
6261
time.Sleep(30 * time.Second)
63-
e2elog.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)
62+
framework.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)
6463
framework.ExpectNoError(e2epod.DeletePodWithWait(c, pod))
6564
})
6665
}

‎test/e2e/storage/flexvolume.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
apierrs "k8s.io/apimachinery/pkg/api/errors"
3030
clientset "k8s.io/client-go/kubernetes"
3131
"k8s.io/kubernetes/test/e2e/framework"
32-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3332
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3433
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
3534
"k8s.io/kubernetes/test/e2e/framework/testfiles"
@@ -119,7 +118,7 @@ func uninstallFlex(c clientset.Interface, node *v1.Node, vendor, driver string)
119118
}
120119

121120
if host == "" {
122-
e2elog.Failf("Error getting node ip : %v", err)
121+
framework.Failf("Error getting node ip : %v", err)
123122
}
124123

125124
cmd := fmt.Sprintf("sudo rm -r %s", flexDir)
@@ -140,7 +139,7 @@ func sshAndLog(cmd, host string, failOnError bool) {
140139
e2essh.LogResult(result)
141140
framework.ExpectNoError(err)
142141
if result.Code != 0 && failOnError {
143-
e2elog.Failf("%s returned non-zero, stderr: %s", cmd, result.Stderr)
142+
framework.Failf("%s returned non-zero, stderr: %s", cmd, result.Stderr)
144143
}
145144
}
146145

0 commit comments

Comments
 (0)