summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_metadata.py8
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)