diff --git a/shade/tests/unit/base.py b/shade/tests/unit/base.py index edcd48d0f..b9214d20e 100644 --- a/shade/tests/unit/base.py +++ b/shade/tests/unit/base.py @@ -449,6 +449,8 @@ class RequestsMockTestCase(BaseTestCase): cloud=test_cloud, validate=True, **kwargs) self.cloud = shade.OpenStackCloud( cloud_config=self.cloud_config) + self.strict_cloud = shade.OpenStackCloud( + cloud_config=self.cloud_config, strict=True) self.op_cloud = shade.OperatorCloud( cloud_config=self.cloud_config) diff --git a/shade/tests/unit/test_caching.py b/shade/tests/unit/test_caching.py index 97fe4bb10..95068b44c 100644 --- a/shade/tests/unit/test_caching.py +++ b/shade/tests/unit/test_caching.py @@ -549,7 +549,7 @@ class TestMemoryCache(base.RequestsMockTestCase): self.cloud.list_images()) -class TestBogusAuth(base.TestCase): +class TestBogusAuth(base.RequestsMockTestCase): def setUp(self): super(TestBogusAuth, self).setUp( diff --git a/shade/tests/unit/test_floating_ip_common.py b/shade/tests/unit/test_floating_ip_common.py index 638294aef..5e30e0c2f 100644 --- a/shade/tests/unit/test_floating_ip_common.py +++ b/shade/tests/unit/test_floating_ip_common.py @@ -27,7 +27,7 @@ from shade.tests import fakes from shade.tests.unit import base -class TestFloatingIP(base.TestCase): +class TestFloatingIP(base.RequestsMockTestCase): @patch.object(OpenStackCloud, 'get_floating_ip') @patch.object(OpenStackCloud, '_attach_ip_to_server') diff --git a/shade/tests/unit/test_inventory.py b/shade/tests/unit/test_inventory.py index c07b304df..ce6ebe59d 100644 --- a/shade/tests/unit/test_inventory.py +++ b/shade/tests/unit/test_inventory.py @@ -22,7 +22,7 @@ from shade.tests import fakes from shade.tests.unit import base -class TestInventory(base.TestCase): +class TestInventory(base.RequestsMockTestCase): def setUp(self): super(TestInventory, self).setUp() diff --git a/shade/tests/unit/test_normalize.py b/shade/tests/unit/test_normalize.py index 44ee5175b..08d135ae9 100644 --- a/shade/tests/unit/test_normalize.py +++ b/shade/tests/unit/test_normalize.py @@ -178,7 +178,7 @@ RAW_FLAVOR_DICT = { 'vcpus': 8} -class TestUtils(base.TestCase): +class TestUtils(base.RequestsMockTestCase): def test_normalize_flavors(self): raw_flavor = RAW_FLAVOR_DICT.copy() @@ -226,6 +226,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_flavor(raw_flavor) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_flavors_strict(self): raw_flavor = RAW_FLAVOR_DICT.copy() expected = { @@ -258,6 +260,8 @@ class TestUtils(base.TestCase): retval = self.strict_cloud._normalize_flavor(raw_flavor) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_nova_images(self): raw_image = RAW_NOVA_IMAGE_DICT.copy() expected = { @@ -351,6 +355,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_image(raw_image) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_nova_images_strict(self): raw_image = RAW_NOVA_IMAGE_DICT.copy() expected = { @@ -405,6 +411,8 @@ class TestUtils(base.TestCase): self.assertEqual(sorted(expected.keys()), sorted(retval.keys())) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_glance_images(self): raw_image = RAW_GLANCE_IMAGE_DICT.copy() expected = { @@ -495,6 +503,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_image(raw_image) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_glance_images_strict(self): raw_image = RAW_GLANCE_IMAGE_DICT.copy() expected = { @@ -548,6 +558,8 @@ class TestUtils(base.TestCase): self.assertEqual(sorted(expected.keys()), sorted(retval.keys())) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_servers_strict(self): raw_server = RAW_SERVER_DICT.copy() expected = { @@ -608,6 +620,8 @@ class TestUtils(base.TestCase): retval = self.strict_cloud._normalize_server(raw_server) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_servers_normal(self): raw_server = RAW_SERVER_DICT.copy() expected = { @@ -691,6 +705,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_server(raw_server) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_secgroups_strict(self): nova_secgroup = dict( id='abc123', @@ -737,6 +753,8 @@ class TestUtils(base.TestCase): retval = self.strict_cloud._normalize_secgroup(nova_secgroup) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_secgroups(self): nova_secgroup = dict( id='abc123', @@ -787,6 +805,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_secgroup(nova_secgroup) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_secgroups_negone_port(self): nova_secgroup = dict( id='abc123', @@ -802,6 +822,8 @@ class TestUtils(base.TestCase): self.assertIsNone(retval['security_group_rules'][0]['port_range_min']) self.assertIsNone(retval['security_group_rules'][0]['port_range_max']) + self.assert_calls() + def test_normalize_secgroup_rules(self): nova_rules = [ dict(id='123', from_port=80, to_port=81, ip_protocol='tcp', @@ -826,6 +848,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_secgroup_rules(nova_rules) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_volumes_v1(self): vol = dict( id='55db9e89-9cb4-4202-af88-d8c4a174998e', @@ -878,6 +902,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_volume(vol) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_volumes_v2(self): vol = dict( id='55db9e89-9cb4-4202-af88-d8c4a174998e', @@ -936,6 +962,8 @@ class TestUtils(base.TestCase): retval = self.cloud._normalize_volume(vol) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_volumes_v1_strict(self): vol = dict( id='55db9e89-9cb4-4202-af88-d8c4a174998e', @@ -982,6 +1010,8 @@ class TestUtils(base.TestCase): retval = self.strict_cloud._normalize_volume(vol) self.assertEqual(expected, retval) + self.assert_calls() + def test_normalize_volumes_v2_strict(self): vol = dict( id='55db9e89-9cb4-4202-af88-d8c4a174998e', @@ -1029,3 +1059,5 @@ class TestUtils(base.TestCase): } retval = self.strict_cloud._normalize_volume(vol) self.assertEqual(expected, retval) + + self.assert_calls() diff --git a/shade/tests/unit/test_task_manager.py b/shade/tests/unit/test_task_manager.py index 1a416ee44..63a145797 100644 --- a/shade/tests/unit/test_task_manager.py +++ b/shade/tests/unit/test_task_manager.py @@ -68,7 +68,7 @@ class TaskTestAsync(task_manager.Task): pass -class TestTaskManager(base.TestCase): +class TestTaskManager(base.RequestsMockTestCase): def setUp(self): super(TestTaskManager, self).setUp()