Test config drive is unmounted in ginkgo

Signed-off-by: Maria Shaldibina <[email protected]>

bin/test-integration

@@ -46,21 +46,4 @@ $bin/go install github.com/onsi/ginkgo/ginkgo
 echo -e "\n Running tests..."
 $bin/env ginkgo -race -trace integration
 
-# check that agent unmounted disk
-result=`vagrant ssh -c "sudo mount | grep -c /dev/loop2" | head -c 1`
-COUNTER=0
-
-while [ "$result" != "0" ];
-do
-  if [ "$COUNTER" -gt 5 ]; then
-  	echo "FAILURE: Drive not unmounted after five seconds"
-  	exit 1
-  fi
-  COUNTER=$((COUNTER+1))
-  sleep 1
-  result=`vagrant ssh -c "sudo mount | grep -c /dev/loop2" | head -c 1`
-done
-
-echo "SUCCESS: Drive unmounted"
-
 exit 0

integration/config_drive_test.go

@@ -1,6 +1,9 @@
 package integration_test
 
 import (
+	"strings"
+	"time"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -54,6 +57,13 @@ var _ = Describe("ConfigDrive", func() {
 				Expect(err).ToNot(HaveOccurred())
 				Expect(settingsJSON).To(ContainSubstring("fake-agent-id"))
 			})
+
+			It("config drive is being unmounted", func() {
+				Eventually(func() string {
+					result, _ := testEnvironment.RunCommand("sudo mount | grep -c /dev/loop2")
+					return strings.TrimSpace(result)
+				}, 5*time.Second, 1*time.Second).Should(Equal("0"))
+			})
 		})
 	})
 })