openstack
/
ec2api-tempest-plugin
Code Issues Proposed changes

Try to remove some compatibility checks 

Change-Id: I95888d94d6c639fcfab54dc08e02bf490a2e10f8
This commit is contained in:
Andrey Pavlov 2015-06-22 15:01:19 +03:00
parent 3b7c0847b9
commit f96186c17d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/test_images.py
View File

@ -49,8 +49,8 @@ class ImageTest(base.EC2TestCase):
self.assertIn('Ebs', bdm)
ebs = bdm['Ebs']
self.assertIsNotNone(ebs.get('SnapshotId'))
self.assertIsNotNone(ebs.get('DeleteOnTermination'))
if CONF.aws.run_incompatible_tests:
self.assertIsNotNone(ebs.get('DeleteOnTermination'))
self.assertIsNotNone(ebs.get('Encrypted'))
self.assertFalse(ebs.get('Encrypted'))
self.assertIsNotNone(ebs.get('VolumeSize'))

2
api/test_instances_ebs.py
View File

@ -45,7 +45,7 @@ class InstanceWithEBSTest(base.EC2TestCase):
self.assertEqual('attached', ebs.get('Status'))
if CONF.aws.run_incompatible_tests:
self.assertTrue(ebs.get('AttachTime'))
self.assertTrue(ebs.get('DeleteOnTermination'))
self.assertTrue(ebs.get('DeleteOnTermination'))
data = self.client.describe_volumes(VolumeIds=[volume_id])
self.assertEqual(1, len(data['Volumes']))