From 91756f4be7cf87ab95effa5a91f3036bda892cef Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 19 Jun 2013 12:27:21 -0700 Subject: Make InstanceList filter non-column extra attributes This is a no-op right now, but we need to avoid passing things like fault to the instance_get_all() queries. This will be used in changes to follow. Related to blueprint unified-object-model Change-Id: I66355a024b139fa6c579e04885ba52f9697381fe --- nova/tests/objects/test_instance.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py index f5128e73f..3a2486f9e 100644 --- a/nova/tests/objects/test_instance.py +++ b/nova/tests/objects/test_instance.py @@ -22,6 +22,7 @@ from nova.objects import base from nova.objects import instance from nova.objects import security_group from nova.openstack.common import timeutils +from nova import test from nova.tests.api.openstack import fakes from nova.tests.objects import test_objects @@ -383,3 +384,10 @@ class TestInstanceListObject(test_objects._LocalTest, class TestRemoteInstanceListObject(test_objects._RemoteTest, _TestInstanceListObject): pass + + +class TestInstanceObjectMisc(test.TestCase): + def test_expected_cols(self): + self.stubs.Set(instance, 'INSTANCE_OPTIONAL_NON_COLUMNS', ['bar']) + self.assertEqual(['foo'], instance.expected_cols(['foo', 'bar'])) + self.assertEqual(None, instance.expected_cols(None)) -- cgit