Merge "Use RequestsMockTestCase everywhere"
This commit is contained in:
commit
f9b4939a8e
|
@ -449,6 +449,8 @@ class RequestsMockTestCase(BaseTestCase):
|
||||||
cloud=test_cloud, validate=True, **kwargs)
|
cloud=test_cloud, validate=True, **kwargs)
|
||||||
self.cloud = shade.OpenStackCloud(
|
self.cloud = shade.OpenStackCloud(
|
||||||
cloud_config=self.cloud_config)
|
cloud_config=self.cloud_config)
|
||||||
|
self.strict_cloud = shade.OpenStackCloud(
|
||||||
|
cloud_config=self.cloud_config, strict=True)
|
||||||
self.op_cloud = shade.OperatorCloud(
|
self.op_cloud = shade.OperatorCloud(
|
||||||
cloud_config=self.cloud_config)
|
cloud_config=self.cloud_config)
|
||||||
|
|
||||||
|
|
|
@ -549,7 +549,7 @@ class TestMemoryCache(base.RequestsMockTestCase):
|
||||||
self.cloud.list_images())
|
self.cloud.list_images())
|
||||||
|
|
||||||
|
|
||||||
class TestBogusAuth(base.TestCase):
|
class TestBogusAuth(base.RequestsMockTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestBogusAuth, self).setUp(
|
super(TestBogusAuth, self).setUp(
|
||||||
|
|
|
@ -27,7 +27,7 @@ from shade.tests import fakes
|
||||||
from shade.tests.unit import base
|
from shade.tests.unit import base
|
||||||
|
|
||||||
|
|
||||||
class TestFloatingIP(base.TestCase):
|
class TestFloatingIP(base.RequestsMockTestCase):
|
||||||
|
|
||||||
@patch.object(OpenStackCloud, 'get_floating_ip')
|
@patch.object(OpenStackCloud, 'get_floating_ip')
|
||||||
@patch.object(OpenStackCloud, '_attach_ip_to_server')
|
@patch.object(OpenStackCloud, '_attach_ip_to_server')
|
||||||
|
|
|
@ -22,7 +22,7 @@ from shade.tests import fakes
|
||||||
from shade.tests.unit import base
|
from shade.tests.unit import base
|
||||||
|
|
||||||
|
|
||||||
class TestInventory(base.TestCase):
|
class TestInventory(base.RequestsMockTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestInventory, self).setUp()
|
super(TestInventory, self).setUp()
|
||||||
|
|
|
@ -178,7 +178,7 @@ RAW_FLAVOR_DICT = {
|
||||||
'vcpus': 8}
|
'vcpus': 8}
|
||||||
|
|
||||||
|
|
||||||
class TestUtils(base.TestCase):
|
class TestUtils(base.RequestsMockTestCase):
|
||||||
|
|
||||||
def test_normalize_flavors(self):
|
def test_normalize_flavors(self):
|
||||||
raw_flavor = RAW_FLAVOR_DICT.copy()
|
raw_flavor = RAW_FLAVOR_DICT.copy()
|
||||||
|
@ -226,6 +226,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_flavor(raw_flavor)
|
retval = self.cloud._normalize_flavor(raw_flavor)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_flavors_strict(self):
|
def test_normalize_flavors_strict(self):
|
||||||
raw_flavor = RAW_FLAVOR_DICT.copy()
|
raw_flavor = RAW_FLAVOR_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -258,6 +260,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.strict_cloud._normalize_flavor(raw_flavor)
|
retval = self.strict_cloud._normalize_flavor(raw_flavor)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_nova_images(self):
|
def test_normalize_nova_images(self):
|
||||||
raw_image = RAW_NOVA_IMAGE_DICT.copy()
|
raw_image = RAW_NOVA_IMAGE_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -351,6 +355,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_image(raw_image)
|
retval = self.cloud._normalize_image(raw_image)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_nova_images_strict(self):
|
def test_normalize_nova_images_strict(self):
|
||||||
raw_image = RAW_NOVA_IMAGE_DICT.copy()
|
raw_image = RAW_NOVA_IMAGE_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -405,6 +411,8 @@ class TestUtils(base.TestCase):
|
||||||
self.assertEqual(sorted(expected.keys()), sorted(retval.keys()))
|
self.assertEqual(sorted(expected.keys()), sorted(retval.keys()))
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_glance_images(self):
|
def test_normalize_glance_images(self):
|
||||||
raw_image = RAW_GLANCE_IMAGE_DICT.copy()
|
raw_image = RAW_GLANCE_IMAGE_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -495,6 +503,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_image(raw_image)
|
retval = self.cloud._normalize_image(raw_image)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_glance_images_strict(self):
|
def test_normalize_glance_images_strict(self):
|
||||||
raw_image = RAW_GLANCE_IMAGE_DICT.copy()
|
raw_image = RAW_GLANCE_IMAGE_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -548,6 +558,8 @@ class TestUtils(base.TestCase):
|
||||||
self.assertEqual(sorted(expected.keys()), sorted(retval.keys()))
|
self.assertEqual(sorted(expected.keys()), sorted(retval.keys()))
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_servers_strict(self):
|
def test_normalize_servers_strict(self):
|
||||||
raw_server = RAW_SERVER_DICT.copy()
|
raw_server = RAW_SERVER_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -608,6 +620,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.strict_cloud._normalize_server(raw_server)
|
retval = self.strict_cloud._normalize_server(raw_server)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_servers_normal(self):
|
def test_normalize_servers_normal(self):
|
||||||
raw_server = RAW_SERVER_DICT.copy()
|
raw_server = RAW_SERVER_DICT.copy()
|
||||||
expected = {
|
expected = {
|
||||||
|
@ -691,6 +705,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_server(raw_server)
|
retval = self.cloud._normalize_server(raw_server)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_secgroups_strict(self):
|
def test_normalize_secgroups_strict(self):
|
||||||
nova_secgroup = dict(
|
nova_secgroup = dict(
|
||||||
id='abc123',
|
id='abc123',
|
||||||
|
@ -737,6 +753,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.strict_cloud._normalize_secgroup(nova_secgroup)
|
retval = self.strict_cloud._normalize_secgroup(nova_secgroup)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_secgroups(self):
|
def test_normalize_secgroups(self):
|
||||||
nova_secgroup = dict(
|
nova_secgroup = dict(
|
||||||
id='abc123',
|
id='abc123',
|
||||||
|
@ -787,6 +805,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_secgroup(nova_secgroup)
|
retval = self.cloud._normalize_secgroup(nova_secgroup)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_secgroups_negone_port(self):
|
def test_normalize_secgroups_negone_port(self):
|
||||||
nova_secgroup = dict(
|
nova_secgroup = dict(
|
||||||
id='abc123',
|
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_min'])
|
||||||
self.assertIsNone(retval['security_group_rules'][0]['port_range_max'])
|
self.assertIsNone(retval['security_group_rules'][0]['port_range_max'])
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_secgroup_rules(self):
|
def test_normalize_secgroup_rules(self):
|
||||||
nova_rules = [
|
nova_rules = [
|
||||||
dict(id='123', from_port=80, to_port=81, ip_protocol='tcp',
|
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)
|
retval = self.cloud._normalize_secgroup_rules(nova_rules)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_volumes_v1(self):
|
def test_normalize_volumes_v1(self):
|
||||||
vol = dict(
|
vol = dict(
|
||||||
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
||||||
|
@ -878,6 +902,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_volume(vol)
|
retval = self.cloud._normalize_volume(vol)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_volumes_v2(self):
|
def test_normalize_volumes_v2(self):
|
||||||
vol = dict(
|
vol = dict(
|
||||||
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
||||||
|
@ -936,6 +962,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.cloud._normalize_volume(vol)
|
retval = self.cloud._normalize_volume(vol)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_volumes_v1_strict(self):
|
def test_normalize_volumes_v1_strict(self):
|
||||||
vol = dict(
|
vol = dict(
|
||||||
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
||||||
|
@ -982,6 +1010,8 @@ class TestUtils(base.TestCase):
|
||||||
retval = self.strict_cloud._normalize_volume(vol)
|
retval = self.strict_cloud._normalize_volume(vol)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
||||||
def test_normalize_volumes_v2_strict(self):
|
def test_normalize_volumes_v2_strict(self):
|
||||||
vol = dict(
|
vol = dict(
|
||||||
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
id='55db9e89-9cb4-4202-af88-d8c4a174998e',
|
||||||
|
@ -1029,3 +1059,5 @@ class TestUtils(base.TestCase):
|
||||||
}
|
}
|
||||||
retval = self.strict_cloud._normalize_volume(vol)
|
retval = self.strict_cloud._normalize_volume(vol)
|
||||||
self.assertEqual(expected, retval)
|
self.assertEqual(expected, retval)
|
||||||
|
|
||||||
|
self.assert_calls()
|
||||||
|
|
|
@ -68,7 +68,7 @@ class TaskTestAsync(task_manager.Task):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TestTaskManager(base.TestCase):
|
class TestTaskManager(base.RequestsMockTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestTaskManager, self).setUp()
|
super(TestTaskManager, self).setUp()
|
||||||
|
|
Loading…
Reference in New Issue