From 7a1195fd633a169afe5a95066dfd7a487843e51f Mon Sep 17 00:00:00 2001 From: jianglingxia Date: Mon, 30 Oct 2017 08:55:51 +0800 Subject: [PATCH] if judgement always true in e2e --- test/e2e/common/volumes.go | 22 +++++----------------- test/e2e/storage/flexvolume.go | 14 +++++--------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/test/e2e/common/volumes.go b/test/e2e/common/volumes.go index 5fb440a67c5..24a9752b265 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/volumes.go @@ -56,9 +56,7 @@ import ( var _ = Describe("[sig-storage] GCP Volumes", func() { f := framework.NewDefaultFramework("gcp-volume") - // If 'false', the test won't clear its volumes upon completion. Useful for debugging, // note that namespace deletion is handled by delete-namespace flag - clean := true // filled in BeforeEach var namespace *v1.Namespace var c clientset.Interface @@ -76,11 +74,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() { Describe("NFSv4", func() { It("should be mountable for NFSv4", func() { config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{}) - defer func() { - if clean { - framework.VolumeTestCleanup(f, config) - } - }() + defer framework.VolumeTestCleanup(f, config) tests := []framework.VolumeTest{ { @@ -104,11 +98,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() { Describe("NFSv3", func() { It("should be mountable for NFSv3", func() { config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{}) - defer func() { - if clean { - framework.VolumeTestCleanup(f, config) - } - }() + defer framework.VolumeTestCleanup(f, config) tests := []framework.VolumeTest{ { @@ -137,11 +127,9 @@ var _ = Describe("[sig-storage] GCP Volumes", func() { config, _, _ := framework.NewGlusterfsServer(c, namespace.Name) name := config.Prefix + "-server" defer func() { - if clean { - framework.VolumeTestCleanup(f, config) - err := c.CoreV1().Endpoints(namespace.Name).Delete(name, nil) - Expect(err).NotTo(HaveOccurred(), "defer: Gluster delete endpoints failed") - } + framework.VolumeTestCleanup(f, config) + err := c.CoreV1().Endpoints(namespace.Name).Delete(name, nil) + Expect(err).NotTo(HaveOccurred(), "defer: Gluster delete endpoints failed") }() tests := []framework.VolumeTest{ diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go index f8e96613e1b..862c692c286 100644 --- a/test/e2e/storage/flexvolume.go +++ b/test/e2e/storage/flexvolume.go @@ -43,7 +43,7 @@ const ( // testFlexVolume tests that a client pod using a given flexvolume driver // successfully mounts it and runs -func testFlexVolume(driver string, cs clientset.Interface, config framework.VolumeTestConfig, f *framework.Framework, clean bool) { +func testFlexVolume(driver string, cs clientset.Interface, config framework.VolumeTestConfig, f *framework.Framework) { tests := []framework.VolumeTest{ { Volume: v1.VolumeSource{ @@ -58,9 +58,7 @@ func testFlexVolume(driver string, cs clientset.Interface, config framework.Volu } framework.TestVolumeClient(cs, config, nil, tests) - if clean { - framework.VolumeTestCleanup(f, config) - } + framework.VolumeTestCleanup(f, config) } // installFlex installs the driver found at filePath on the node, and restarts @@ -141,9 +139,7 @@ func sshAndLog(cmd, host string) { var _ = SIGDescribe("Flexvolumes [Disruptive] [Feature:FlexVolume]", func() { f := framework.NewDefaultFramework("flexvolume") - // If 'false', the test won't clear its volumes upon completion. Useful for debugging, // note that namespace deletion is handled by delete-namespace flag - clean := true var cs clientset.Interface var ns *v1.Namespace @@ -176,7 +172,7 @@ var _ = SIGDescribe("Flexvolumes [Disruptive] [Feature:FlexVolume]", func() { By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driverInstallAs)) installFlex(&node, "k8s", driverInstallAs, path.Join(driverDir, driver), true /* restart */) - testFlexVolume(driverInstallAs, cs, config, f, clean) + testFlexVolume(driverInstallAs, cs, config, f) By("waiting for flex client pod to terminate") if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) { @@ -196,7 +192,7 @@ var _ = SIGDescribe("Flexvolumes [Disruptive] [Feature:FlexVolume]", func() { By(fmt.Sprintf("installing flexvolume %s on master as %s", path.Join(driverDir, driver), driverInstallAs)) installFlex(nil, "k8s", driverInstallAs, path.Join(driverDir, driver), true /* restart */) - testFlexVolume(driverInstallAs, cs, config, f, clean) + testFlexVolume(driverInstallAs, cs, config, f) By("waiting for flex client pod to terminate") if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) { @@ -216,7 +212,7 @@ var _ = SIGDescribe("Flexvolumes [Disruptive] [Feature:FlexVolume]", func() { By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driverInstallAs)) installFlex(&node, "k8s", driverInstallAs, path.Join(driverDir, driver), false /* restart */) - testFlexVolume(driverInstallAs, cs, config, f, clean) + testFlexVolume(driverInstallAs, cs, config, f) By("waiting for flex client pod to terminate") if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) {