cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [2/2] git commit: updated refs/heads/master to 40b59d7
Date Sat, 27 Jul 2013 16:23:31 GMT
CLOUDSTACK-2882: We are mounting an ISO not a volume

So fdisk -l doesn't list the mounted iso. Instead use showmount -e to
find the mounted device.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 93f79e1a158cb1f69915a4036f5c1840a38c5e53)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40b59d7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40b59d7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40b59d7e

Branch: refs/heads/master
Commit: 40b59d7e2acfb88d65d9374e9723b7fe38eabf3c
Parents: 738523b
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jul 27 20:18:05 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jul 27 21:53:16 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_vm_life_cycle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40b59d7e/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 7dab5cf..8e5a8bb 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -749,7 +749,7 @@ class TestVMLifeCycle(cloudstackTestCase):
         else:
             self.skipTest("No mount points matched. Mount was unsuccessful")
 
-        c = "fdisk -l|grep %s|head -1" % self.services["mount"]
+        c = "mount |grep %s|head -1" % self.services["mount"]
         res = ssh_client.execute(c)
         self.debug("Found a mount point at %s" % res)
 
@@ -775,7 +775,7 @@ class TestVMLifeCycle(cloudstackTestCase):
         self.assertEqual(
                          str(iso_size) in result,
                          True,
-                         "Check size of the attached ISO"
+                         "ISO size mismatch. reported size within guest %s" % str(iso_size)
                          )
         try:
             #Unmount ISO


Mime
View raw message