summaryrefslogtreecommitdiff
path: root/nova/tests/unit/test_metadata.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests/unit/test_metadata.py')
-rw-r--r--nova/tests/unit/test_metadata.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py
index 8aebd4c2d6..89d5a73224 100644
--- a/nova/tests/unit/test_metadata.py
+++ b/nova/tests/unit/test_metadata.py
@@ -165,14 +165,6 @@ def fake_request(testcase, mdinst, relpath, address="127.0.0.1",
return response
-class FakeDeviceMetadata(metadata_obj.DeviceMetadata):
- pass
-
-
-class FakeDeviceBus(metadata_obj.DeviceBus):
- pass
-
-
def fake_metadata_objects():
nic_obj = metadata_obj.NetworkInterfaceMetadata(
bus=metadata_obj.PCIDeviceBus(address='0000:00:01.0'),
@@ -202,9 +194,9 @@ def fake_metadata_objects():
path='/dev/sda',
tags=['baz'],
)
- fake_device_obj = FakeDeviceMetadata()
+ fake_device_obj = metadata_obj.DeviceMetadata()
device_with_fake_bus_obj = metadata_obj.NetworkInterfaceMetadata(
- bus=FakeDeviceBus(),
+ bus=metadata_obj.DeviceBus(),
mac='00:00:00:00:00:00',
tags=['foo']
)
@@ -397,6 +389,12 @@ class MetadataTestCase(test.TestCase):
self.assertRaises(base.InvalidMetadataPath,
md.lookup, "/2009-04-04/meta-data/kernel-id")
+ def test_instance_is_sanitized(self):
+ inst = self.instance.obj_clone()
+ inst._will_not_pass = True
+ md = fake_InstanceMetadata(self, inst)
+ self.assertFalse(hasattr(md.instance, '_will_not_pass'))
+
def test_check_version(self):
inst = self.instance.obj_clone()
md = fake_InstanceMetadata(self, inst)