diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2012-03-14 13:20:07 -0700 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2012-03-14 13:36:50 -0700 |
| commit | 4c8dbf81d9a9f27faeb19271b774ea4f130e516c (patch) | |
| tree | 2fd5d42d7a2df209fcc533c25cecd5445a7809b4 /nova/tests/test_metadata.py | |
| parent | f40357574245d2e3b8cb7995cb27adc8e9b99175 (diff) | |
| download | nova-4c8dbf81d9a9f27faeb19271b774ea4f130e516c.tar.gz nova-4c8dbf81d9a9f27faeb19271b774ea4f130e516c.tar.xz nova-4c8dbf81d9a9f27faeb19271b774ea4f130e516c.zip | |
metadata speed - revert logic changes, just caching
* reverts most of https://review.openstack.org/5042
* keep changes that cache the results so subsequent calls are fast
fixes bug 954377
Change-Id: Ia047f1d04dc360dd657d4d80d3dff8c8101635cd
Diffstat (limited to 'nova/tests/test_metadata.py')
| -rw-r--r-- | nova/tests/test_metadata.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index a8fe448bb..7bd3ebcdd 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -119,7 +119,7 @@ class MetadataTestCase(test.TestCase): request = webob.Request.blank('/user-data') request.remote_addr = None response = request.get_response(self.app) - self.assertEqual(response.status_int, 404) + self.assertEqual(response.status_int, 500) def test_user_data_invalid_url(self): request = webob.Request.blank('/user-data-invalid') @@ -177,7 +177,9 @@ class MetadataTestCase(test.TestCase): 'swap': '/dev/sdc', 'ebs0': '/dev/sdh'} - self.assertEqual(self.app._format_instance_mapping(instance_ref0), + self.assertEqual(self.app._format_instance_mapping(ctxt, + instance_ref0), handler._DEFAULT_MAPPINGS) - self.assertEqual(self.app._format_instance_mapping(instance_ref1), + self.assertEqual(self.app._format_instance_mapping(ctxt, + instance_ref1), expected) |