diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 19:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 19:53:17 +0000 |
| commit | 46cdc3b4aa74effba64ae40a0b5d9a72a9ded420 (patch) | |
| tree | 0638bde1fdc9226d0e05373ff2bfd531be44fd4f | |
| parent | 6ec9e097f8c476e1655464a7e5e535700ddb8d0d (diff) | |
| parent | a0ae2e2fa0ba3c52f8eed4bbb97c5de20c2106cb (diff) | |
| download | nova-46cdc3b4aa74effba64ae40a0b5d9a72a9ded420.tar.gz nova-46cdc3b4aa74effba64ae40a0b5d9a72a9ded420.tar.xz nova-46cdc3b4aa74effba64ae40a0b5d9a72a9ded420.zip | |
Merge "minor improvements to nova/tests/test_metadata.py"
| -rw-r--r-- | nova/tests/test_metadata.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 29e63aba7..f15d71633 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -342,7 +342,7 @@ class OpenStackMetadataTestCase(test.TestCase): mdinst = fake_InstanceMetadata(self.stubs, inst) # since this instance had no user-data it should not be there. - self.assertFalse('user-data' in mdinst.lookup("/openstack/2012-08-10")) + self.assertFalse('user_data' in mdinst.lookup("/openstack/2012-08-10")) self.assertRaises(base.InvalidMetadataPath, mdinst.lookup, "/openstack/2012-08-10/user_data") @@ -362,6 +362,14 @@ class OpenStackMetadataTestCase(test.TestCase): mdjson = mdinst.lookup("/openstack/2012-08-10/meta_data.json") self.assertFalse("random_seed" in json.loads(mdjson)) + def test_no_dashes_in_metadata(self): + # top level entries in meta_data should not contain '-' in their name + inst = copy(self.instance) + mdinst = fake_InstanceMetadata(self.stubs, inst) + mdjson = json.loads(mdinst.lookup("/openstack/latest/meta_data.json")) + + self.assertEqual([], [k for k in mdjson.keys() if k.find("-") != -1]) + class MetadataHandlerTestCase(test.TestCase): """Test that metadata is returning proper values.""" |