diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-03-28 15:46:01 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-03-28 15:46:01 -0700 |
| commit | 233fd092018ace16f0b9caaca55f4e2107c41fe2 (patch) | |
| tree | 91ad29478027b6324c3f00c3c3d02e6a63667c97 /smoketests | |
| parent | e025ede777b0ee6652e035dfde467037f0485de2 (diff) | |
| download | nova-233fd092018ace16f0b9caaca55f4e2107c41fe2.tar.gz nova-233fd092018ace16f0b9caaca55f4e2107c41fe2.tar.xz nova-233fd092018ace16f0b9caaca55f4e2107c41fe2.zip | |
Fixes volume smoketests to work with ami-tty
Diffstat (limited to 'smoketests')
| -rw-r--r-- | smoketests/test_sysadmin.py | 4 |
1 files 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)) |