This commit is contained in:
Soren Hansen 2011-03-18 13:17:40 +01:00
parent 6e632e9ef2
commit 4b18488223
3 changed files with 3 additions and 3 deletions

View File

@ -190,4 +190,3 @@ class UserSmokeTestCase(SmokeTestCase):
global TEST_DATA
self.conn = self.connection_for_env()
self.data = TEST_DATA

View File

@ -78,6 +78,7 @@ from nose import result
from smoketests import flags
FLAGS = flags.FLAGS
class _AnsiColorizer(object):
"""
A colorizer is an object that loosely wraps around a stream, allowing

View File

@ -265,10 +265,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)
"blockdev --getsize64 %s" % self.device)
out = stdout.read().strip()
conn.close()
expected_size = 1024*1024*1024
expected_size = 1024 * 1024 * 1024
self.assertEquals('%s' % (expected_size,), out,
'Volume is not the right size: %s %s. Expected: %s' %
(out, stderr.read(), expected_size))