From 86fd8bc8e72de6776cf79ec3e574552a7fd45cf2 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 27 Oct 2011 12:35:44 -0400 Subject: [PATCH] Relaxing FlavorsTest entity checking There's already an extension in nova that changes the flavor entity, so we need to change the check to look for a minimum set of keys. Change-Id: I585e167908718805e36c9cdb88940e9ca0c06ec5 --- kong/tests/test_flavors.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kong/tests/test_flavors.py b/kong/tests/test_flavors.py index 055447ea40..adcdcadf6d 100644 --- a/kong/tests/test_flavors.py +++ b/kong/tests/test_flavors.py @@ -35,8 +35,11 @@ class FlavorsTest(tests.FunctionalTest): def _assert_flavor_entity_detailed(self, flavor): actual_keys = set(flavor.keys()) - expected_keys = set(('id', 'name', 'ram', 'disk', 'links')) - self.assertEqual(actual_keys, expected_keys) + expected_keys = set(('id', 'name', 'ram', 'disk', 'vcpus', 'links')) + #NOTE(bcwaldon): We cannot expect an explicit list of keys since + # any extension can a new attribute to a flavor entity. However, we + # can expect a minimum set of keys defined in the spec. + self.assertTrue(actual_keys >= expected_keys) self.assertEqual(type(flavor['ram']), int) self.assertEqual(type(flavor['disk']), int) self._assert_flavor_links(flavor)