From f19d5701fe34374f674d7fd334184d51aae061c4 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 24 Aug 2012 17:16:32 -0400 Subject: fix test case for copy of uuid -> instance-id --- tests/unittests/test_datasource/test_configdrive.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/unittests') diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py index 50b97ef8..55573114 100644 --- a/tests/unittests/test_datasource/test_configdrive.py +++ b/tests/unittests/test_datasource/test_configdrive.py @@ -79,8 +79,11 @@ class TestConfigDriveDataSource(TestCase): found = ds.read_config_drive_dir(self.tmp) + expected_md = copy(OSTACK_META) + expected_md['instance-id'] = expected_md['uuid'] + self.assertEqual(USER_DATA, found['userdata']) - self.assertEqual(OSTACK_META, found['metadata']) + self.assertEqual(expected_md, found['metadata']) self.assertEqual(found['files']['/etc/foo.cfg'], CONTENT_0) self.assertEqual(found['files']['/etc/bar/bar.cfg'], CONTENT_1) @@ -94,7 +97,11 @@ class TestConfigDriveDataSource(TestCase): populate_dir(self.tmp, data) found = ds.read_config_drive_dir(self.tmp) - self.assertEqual(OSTACK_META, found['metadata']) + + expected_md = copy(OSTACK_META) + expected_md['instance-id'] = expected_md['uuid'] + + self.assertEqual(expected_md, found['metadata']) def test_seed_dir_bad_json_metadata(self): """Verify that bad json in metadata raises BrokenConfigDriveDir.""" -- cgit v1.2.3