x/gantt
Code Issues Proposed changes

pep8

Browse Source
This commit is contained in:
Isaku Yamahata
2011-06-15 23:11:03 +09:00
parent 817bc926b2
commit 496365f12a
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/test_cloud.py
View File

@@ -541,7 +541,7 @@ class CloudTestCase(test.TestCase):
kwargs = {'image_id': 'ami-1', kwargs = {'image_id': 'ami-1',
'instance_type': FLAGS.default_instance_type, 'instance_type': FLAGS.default_instance_type,
'max_count': 1,} 'max_count': 1, }
instance_id = self._run_instance_wait(**kwargs) instance_id = self._run_instance_wait(**kwargs)
# a running instance can't be started. It is just ignored. # a running instance can't be started. It is just ignored.
@@ -574,7 +574,7 @@ class CloudTestCase(test.TestCase):
kwargs = {'status': 'available', kwargs = {'status': 'available',
'host': self.volume.host, 'host': self.volume.host,
'size': 1, 'size': 1,
'attach_status': 'detached',} 'attach_status': 'detached', }
return db.volume_create(self.context, kwargs) return db.volume_create(self.context, kwargs)
def _assert_volume_attached(self, vol, instance_id, mountpoint): def _assert_volume_attached(self, vol, instance_id, mountpoint):
@@ -605,7 +605,7 @@ class CloudTestCase(test.TestCase):
'delete_on_termination': False,}, 'delete_on_termination': False,},
{'device_name': '/dev/vdc', {'device_name': '/dev/vdc',
'volume_id': vol2['id'], 'volume_id': vol2['id'],
'delete_on_termination': True,}, 'delete_on_termination': True, },
]} ]}
ec2_instance_id = self._run_instance_wait(**kwargs) ec2_instance_id = self._run_instance_wait(**kwargs)
instance_id = ec2utils.ec2_id_to_id(ec2_instance_id) instance_id = ec2utils.ec2_id_to_id(ec2_instance_id)
@@ -669,7 +669,7 @@ class CloudTestCase(test.TestCase):
'max_count': 1, 'max_count': 1,
'block_device_mapping': [{'device_name': '/dev/vdb', 'block_device_mapping': [{'device_name': '/dev/vdb',
'volume_id': vol1['id'], 'volume_id': vol1['id'],
'delete_on_termination': True,},]} 'delete_on_termination': True}]}
ec2_instance_id = self._run_instance_wait(**kwargs) ec2_instance_id = self._run_instance_wait(**kwargs)
instance_id = ec2utils.ec2_id_to_id(ec2_instance_id) instance_id = ec2utils.ec2_id_to_id(ec2_instance_id)
@@ -747,10 +747,10 @@ class CloudTestCase(test.TestCase):
'max_count': 1, 'max_count': 1,
'block_device_mapping': [{'device_name': '/dev/vdb', 'block_device_mapping': [{'device_name': '/dev/vdb',
'snapshot_id': snapshot1_id, 'snapshot_id': snapshot1_id,
'delete_on_termination': False,}, 'delete_on_termination': False, },
{'device_name': '/dev/vdc', {'device_name': '/dev/vdc',
'snapshot_id': snapshot2_id, 'snapshot_id': snapshot2_id,
'delete_on_termination': True,},],} 'delete_on_termination': True}]}
ec2_instance_id = self._run_instance_wait(**kwargs) ec2_instance_id = self._run_instance_wait(**kwargs)
instance_id = ec2utils.ec2_id_to_id(ec2_instance_id) instance_id = ec2utils.ec2_id_to_id(ec2_instance_id)