Merge pull request #59872 from vmware/remove-production-code-usage-in-e2e-tests

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fixing diskIsAttached function **What this PR does / why we need it**: This PR fixes the `diskIsAttached` function. When disk is detached from the Node, this function was returning true, which results into time out for some vsphere e2e test cases. **Which issue(s) this PR fixes** Fixes # **Special notes for your reviewer**: Executed E2E test to verify failures are resolved with this change. **Release note**: ```release-note NONE ```

Merge pull request #59872 from vmware/remove-production-code-usage-in-e2e-tests
00070b54 · Kubernetes Submit Queue · GitHub · 4949b63e · 7699a769 · 00070b54
Unverified Commit 00070b54 authored Feb 14, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

vsphere_utils.go test/e2e/storage/vsphere/vsphere_utils.go +3 -4

vsphere_volume_fstype.go test/e2e/storage/vsphere/vsphere_volume_fstype.go +1 -1

No files found.
--- a/test/e2e/storage/vsphere/vsphere_utils.go
+++ b/test/e2e/storage/vsphere/vsphere_utils.go
@@ -719,11 +719,10 @@ func diskIsAttached(volPath string, nodeName string) (bool, error) {
 			nodeName)
 		return false, err
 	}
-	if device != nil {
-		framework.Logf("diskIsAttached found the disk %q attached on node %q",
-			volPath,
-			nodeName)
+	if device == nil {
+		return false, nil
 	}
+	framework.Logf("diskIsAttached found the disk %q attached on node %q", volPath, nodeName)
 	return true, nil
 }


--- a/test/e2e/storage/vsphere/vsphere_volume_fstype.go
+++ b/test/e2e/storage/vsphere/vsphere_volume_fstype.go
@@ -73,7 +73,7 @@ var _ = utils.SIGDescribe("Volume FStype [Feature:vsphere]", func() {
 		Bootstrap(f)
 		client = f.ClientSet
 		namespace = f.Namespace.Name
-		Expect(GetReadySchedulableNodeInfos).NotTo(BeEmpty())
+		Expect(GetReadySchedulableNodeInfos()).NotTo(BeEmpty())
 	})

 	It("verify fstype - ext3 formatted volume", func() {