From 233fd092018ace16f0b9caaca55f4e2107c41fe2 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 28 Mar 2011 15:46:01 -0700 Subject: Fixes volume smoketests to work with ami-tty --- smoketests/test_sysadmin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoketests/test_sysadmin.py b/smoketests/test_sysadmin.py index 9bed1e092..89a3e60c4 100644 --- a/smoketests/test_sysadmin.py +++ b/smoketests/test_sysadmin.py @@ -266,10 +266,10 @@ class VolumeTests(base.UserSmokeTestCase): ip = self.data['instance'].private_dns_name conn = self.connect_ssh(ip, TEST_KEY) stdin, stdout, stderr = conn.exec_command( - "blockdev --getsize64 %s" % self.device) + "cat /sys/class/block/%s/size" % self.device.rpartition('/')[2]) out = stdout.read().strip() conn.close() - expected_size = 1024 * 1024 * 1024 + expected_size = 1024 * 1024 * 1024 / 512 self.assertEquals('%s' % (expected_size,), out, 'Volume is not the right size: %s %s. Expected: %s' % (out, stderr.read(), expected_size)) -- cgit From 3a39fb7b09dfee3c971ae4adaeff4717f4839f8a Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 28 Mar 2011 16:50:33 -0700 Subject: add note per review --- smoketests/test_sysadmin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/smoketests/test_sysadmin.py b/smoketests/test_sysadmin.py index 89a3e60c4..268d9865b 100644 --- a/smoketests/test_sysadmin.py +++ b/smoketests/test_sysadmin.py @@ -269,6 +269,7 @@ class VolumeTests(base.UserSmokeTestCase): "cat /sys/class/block/%s/size" % self.device.rpartition('/')[2]) out = stdout.read().strip() conn.close() + # NOTE(vish): 1G bytes / 512 bytes per block expected_size = 1024 * 1024 * 1024 / 512 self.assertEquals('%s' % (expected_size,), out, 'Volume is not the right size: %s %s. Expected: %s' % -- cgit