diff options
| author | John Tran <jtran@attinteractive.com> | 2011-08-16 09:18:13 -0700 |
|---|---|---|
| committer | John Tran <jtran@attinteractive.com> | 2011-08-16 09:18:13 -0700 |
| commit | ca13037d2cd130f5b970d3af219566f3a70a9cb5 (patch) | |
| tree | e73c209fed611e29154c9c3400a144a5da1ff06e | |
| parent | 3e561f148fcba627f8fbd4ab1089f426fbc2e61b (diff) | |
| download | nova-ca13037d2cd130f5b970d3af219566f3a70a9cb5.tar.gz nova-ca13037d2cd130f5b970d3af219566f3a70a9cb5.tar.xz nova-ca13037d2cd130f5b970d3af219566f3a70a9cb5.zip | |
test improvements per peer review
| -rw-r--r-- | nova/tests/test_cloud.py | 10 | ||||
| -rw-r--r-- | nova/tests/test_db_api.py | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index 39358eeff..0793784f8 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -488,13 +488,15 @@ class CloudTestCase(test.TestCase): db.service_destroy(self.context, comp2['id']) def test_describe_instances_deleted(self): - args = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'} - inst1 = db.instance_create(self.context, args) - inst2 = db.instance_create(self.context, args) + args1 = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'} + inst1 = db.instance_create(self.context, args1) + args2 = {'reservation_id': 'b', 'image_ref': 1, 'host': 'host1'} + inst2 = db.instance_create(self.context, args2) db.instance_destroy(self.context, inst1.id) result = self.cloud.describe_instances(self.context) result = result['reservationSet'][0]['instancesSet'] - self.assertEqual(1, len(result)) + self.assertEqual(result[0]['instanceId'], + ec2utils.id_to_ec2_id(inst2.id)) def _block_device_mapping_create(self, instance_id, mappings): volumes = [] diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index ed363d1be..038c07f40 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -85,9 +85,11 @@ class DbApiTestCase(test.TestCase): self.assertTrue(2, len(result)) def test_instance_get_all_by_filters_deleted(self): - args = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'} - inst1 = db.instance_create(self.context, args) - inst2 = db.instance_create(self.context, args) + args1 = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'} + inst1 = db.instance_create(self.context, args1) + args2 = {'reservation_id': 'b', 'image_ref': 1, 'host': 'host1'} + inst2 = db.instance_create(self.context, args2) db.instance_destroy(self.context, inst1.id) - result = db.instance_get_all_by_filters(self.context, {}) - self.assertTrue(1, len(result)) + result = db.instance_get_all_by_filters(self.context.elevated(), {}) + self.assertEqual(1, len(result)) + self.assertEqual(result[0].id, inst2.id) |