diff options
Diffstat (limited to 'openstackclient/tests/unit/api')
| -rw-r--r-- | openstackclient/tests/unit/api/fakes.py | 1 | ||||
| -rw-r--r-- | openstackclient/tests/unit/api/test_api.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/unit/api/test_compute_v2.py | 27 | ||||
| -rw-r--r-- | openstackclient/tests/unit/api/test_image_v1.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/unit/api/test_image_v2.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/unit/api/test_object_store_v1.py | 94 |
6 files changed, 60 insertions, 70 deletions
diff --git a/openstackclient/tests/unit/api/fakes.py b/openstackclient/tests/unit/api/fakes.py index 26213a2f..5db72242 100644 --- a/openstackclient/tests/unit/api/fakes.py +++ b/openstackclient/tests/unit/api/fakes.py @@ -47,7 +47,6 @@ LIST_BODY = { class TestSession(utils.TestCase): - BASE_URL = 'https://api.example.com:1234/vX' def setUp(self): diff --git a/openstackclient/tests/unit/api/test_api.py b/openstackclient/tests/unit/api/test_api.py index 5f4a0c1a..597fa107 100644 --- a/openstackclient/tests/unit/api/test_api.py +++ b/openstackclient/tests/unit/api/test_api.py @@ -20,7 +20,6 @@ from openstackclient.tests.unit.api import fakes as api_fakes class TestKeystoneSession(api_fakes.TestSession): - def setUp(self): super(TestKeystoneSession, self).setUp() self.api = api.KeystoneSession( @@ -40,7 +39,6 @@ class TestKeystoneSession(api_fakes.TestSession): class TestBaseAPI(api_fakes.TestSession): - def setUp(self): super(TestBaseAPI, self).setUp() self.api = api.BaseAPI( @@ -80,7 +78,6 @@ class TestBaseAPI(api_fakes.TestSession): # find tests def test_find_attr_by_id(self): - # All first requests (by name) will fail in this test self.requests_mock.register_uri( 'GET', @@ -172,7 +169,6 @@ class TestBaseAPI(api_fakes.TestSession): self.assertEqual(api_fakes.RESP_ITEM_1, ret) def test_find_attr_path_resource(self): - # Test resource different than path self.requests_mock.register_uri( 'GET', diff --git a/openstackclient/tests/unit/api/test_compute_v2.py b/openstackclient/tests/unit/api/test_compute_v2.py index edf5258f..1ed164ac 100644 --- a/openstackclient/tests/unit/api/test_compute_v2.py +++ b/openstackclient/tests/unit/api/test_compute_v2.py @@ -26,7 +26,6 @@ FAKE_URL = 'http://gopher.com/v2' class TestComputeAPIv2(utils.TestCase): - def setUp(self): super(TestComputeAPIv2, self).setUp() sess = session.Session() @@ -35,18 +34,17 @@ class TestComputeAPIv2(utils.TestCase): class TestFloatingIP(TestComputeAPIv2): - FAKE_FLOATING_IP_RESP = { 'id': 1, - 'ip': '203.0.113.11', # TEST-NET-3 - 'fixed_ip': '198.51.100.11', # TEST-NET-2 + 'ip': '203.0.113.11', # TEST-NET-3 + 'fixed_ip': '198.51.100.11', # TEST-NET-2 'pool': 'nova', 'instance_id': None, } FAKE_FLOATING_IP_RESP_2 = { 'id': 2, - 'ip': '203.0.113.12', # TEST-NET-3 - 'fixed_ip': '198.51.100.12', # TEST-NET-2 + 'ip': '203.0.113.12', # TEST-NET-3 + 'fixed_ip': '198.51.100.12', # TEST-NET-2 'pool': 'nova', 'instance_id': None, } @@ -213,7 +211,6 @@ class TestFloatingIP(TestComputeAPIv2): class TestFloatingIPPool(TestComputeAPIv2): - LIST_FLOATING_IP_POOL_RESP = [ {"name": "tide"}, {"name": "press"}, @@ -231,7 +228,6 @@ class TestFloatingIPPool(TestComputeAPIv2): class TestHost(TestComputeAPIv2): - FAKE_HOST_RESP_1 = { "zone": "internal", "host_name": "myhost", @@ -340,7 +336,6 @@ class TestHost(TestComputeAPIv2): class TestNetwork(TestComputeAPIv2): - FAKE_NETWORK_RESP = { 'id': '1', 'label': 'label1', @@ -491,20 +486,19 @@ class TestNetwork(TestComputeAPIv2): class TestSecurityGroup(TestComputeAPIv2): - FAKE_SECURITY_GROUP_RESP = { 'id': '1', 'name': 'sg1', 'description': 'test security group', 'tenant_id': '0123456789', - 'rules': [] + 'rules': [], } FAKE_SECURITY_GROUP_RESP_2 = { 'id': '2', 'name': 'sg2', 'description': 'another test security group', 'tenant_id': '0123456789', - 'rules': [] + 'rules': [], } LIST_SECURITY_GROUP_RESP = [ FAKE_SECURITY_GROUP_RESP_2, @@ -656,8 +650,8 @@ class TestSecurityGroup(TestComputeAPIv2): status_code=200, ) ret = self.api.security_group_set( - security_group='1', - description='desc2') + security_group='1', description='desc2' + ) self.assertEqual(self.FAKE_SECURITY_GROUP_RESP, ret) def test_security_group_set_options_name(self): @@ -679,13 +673,12 @@ class TestSecurityGroup(TestComputeAPIv2): status_code=200, ) ret = self.api.security_group_set( - security_group='sg2', - description='desc2') + security_group='sg2', description='desc2' + ) self.assertEqual(self.FAKE_SECURITY_GROUP_RESP_2, ret) class TestSecurityGroupRule(TestComputeAPIv2): - FAKE_SECURITY_GROUP_RULE_RESP = { 'id': '1', 'name': 'sgr1', diff --git a/openstackclient/tests/unit/api/test_image_v1.py b/openstackclient/tests/unit/api/test_image_v1.py index 6ce3ddea..74899ad4 100644 --- a/openstackclient/tests/unit/api/test_image_v1.py +++ b/openstackclient/tests/unit/api/test_image_v1.py @@ -25,7 +25,6 @@ FAKE_URL = 'http://gopher.dev10.com' class TestImageAPIv1(utils.TestCase): - def setUp(self): super(TestImageAPIv1, self).setUp() @@ -35,7 +34,6 @@ class TestImageAPIv1(utils.TestCase): class TestImage(TestImageAPIv1): - PUB_PROT = { 'id': '1', 'name': 'pub1', diff --git a/openstackclient/tests/unit/api/test_image_v2.py b/openstackclient/tests/unit/api/test_image_v2.py index 22490e46..0de71acb 100644 --- a/openstackclient/tests/unit/api/test_image_v2.py +++ b/openstackclient/tests/unit/api/test_image_v2.py @@ -25,7 +25,6 @@ FAKE_URL = 'http://gopher.dev20.com' class TestImageAPIv2(utils.TestCase): - def setUp(self): super(TestImageAPIv2, self).setUp() @@ -35,7 +34,6 @@ class TestImageAPIv2(utils.TestCase): class TestImage(TestImageAPIv2): - PUB_PROT = { 'id': '1', 'name': 'pub1', diff --git a/openstackclient/tests/unit/api/test_object_store_v1.py b/openstackclient/tests/unit/api/test_object_store_v1.py index b9e0740c..e516d3de 100644 --- a/openstackclient/tests/unit/api/test_object_store_v1.py +++ b/openstackclient/tests/unit/api/test_object_store_v1.py @@ -30,10 +30,18 @@ FAKE_CONTAINER = 'rainbarrel' FAKE_OBJECT = 'spigot' LIST_CONTAINER_RESP = [ - {"name": "qaz", "count": 0, "bytes": 0, - "last_modified": "2020-05-16T05:52:07.377550"}, - {"name": "fred", "count": 0, "bytes": 0, - "last_modified": "2020-05-16T05:55:07.377550"}, + { + "name": "qaz", + "count": 0, + "bytes": 0, + "last_modified": "2020-05-16T05:52:07.377550", + }, + { + "name": "fred", + "count": 0, + "bytes": 0, + "last_modified": "2020-05-16T05:55:07.377550", + }, ] LIST_OBJECT_RESP = [ @@ -43,7 +51,6 @@ LIST_OBJECT_RESP = [ class TestObjectAPIv1(utils.TestCase): - def setUp(self): super(TestObjectAPIv1, self).setUp() sess = session.Session() @@ -52,7 +59,6 @@ class TestObjectAPIv1(utils.TestCase): class TestContainer(TestObjectAPIv1): - def setUp(self): super(TestContainer, self).setUp() @@ -128,15 +134,17 @@ class TestContainer(TestObjectAPIv1): ) self.requests_mock.register_uri( 'GET', - FAKE_URL + - '?marker=%s&limit=1&format=json' % LIST_CONTAINER_RESP[0]['name'], + FAKE_URL + + '?marker=%s&limit=1&format=json' + % LIST_CONTAINER_RESP[0]['name'], json=[LIST_CONTAINER_RESP[1]], status_code=200, ) self.requests_mock.register_uri( 'GET', - FAKE_URL + - '?marker=%s&limit=1&format=json' % LIST_CONTAINER_RESP[1]['name'], + FAKE_URL + + '?marker=%s&limit=1&format=json' + % LIST_CONTAINER_RESP[1]['name'], json=[], status_code=200, ) @@ -151,7 +159,7 @@ class TestContainer(TestObjectAPIv1): 'X-Container-Meta-Owner': FAKE_ACCOUNT, 'x-container-object-count': '1', 'x-container-bytes-used': '577', - 'x-storage-policy': 'o1--sr-r3' + 'x-storage-policy': 'o1--sr-r3', } resp = { 'account': FAKE_ACCOUNT, @@ -172,7 +180,6 @@ class TestContainer(TestObjectAPIv1): class TestObject(TestObjectAPIv1): - def setUp(self): super(TestObject, self).setUp() @@ -209,7 +216,7 @@ class TestObject(TestObjectAPIv1): def test_object_create(self): self.base_object_create('111\n222\n333\n') - self.base_object_create(bytes([0x31, 0x00, 0x0d, 0x0a, 0x7f, 0xff])) + self.base_object_create(bytes([0x31, 0x00, 0x0D, 0x0A, 0x7F, 0xFF])) def test_object_delete(self): self.requests_mock.register_uri( @@ -274,35 +281,35 @@ class TestObject(TestObjectAPIv1): ) self.assertEqual(LIST_CONTAINER_RESP, ret) -# def test_list_objects_full_listing(self): -# sess = self.app.client_manager.session -# -# def side_effect(*args, **kwargs): -# rv = sess.get().json.return_value -# sess.get().json.return_value = [] -# sess.get().json.side_effect = None -# return rv -# -# resp = [{'name': 'is-name'}] -# sess.get().json.return_value = resp -# sess.get().json.side_effect = side_effect -# -# data = lib_object.list_objects( -# sess, -# fake_url, -# fake_container, -# full_listing=True, -# ) -# -# # Check expected values -# sess.get.assert_called_with( -# fake_url + '/' + fake_container, -# params={ -# 'format': 'json', -# 'marker': 'is-name', -# } -# ) -# self.assertEqual(resp, data) + # def test_list_objects_full_listing(self): + # sess = self.app.client_manager.session + # + # def side_effect(*args, **kwargs): + # rv = sess.get().json.return_value + # sess.get().json.return_value = [] + # sess.get().json.side_effect = None + # return rv + # + # resp = [{'name': 'is-name'}] + # sess.get().json.return_value = resp + # sess.get().json.side_effect = side_effect + # + # data = lib_object.list_objects( + # sess, + # fake_url, + # fake_container, + # full_listing=True, + # ) + # + # # Check expected values + # sess.get.assert_called_with( + # fake_url + '/' + fake_container, + # params={ + # 'format': 'json', + # 'marker': 'is-name', + # } + # ) + # self.assertEqual(resp, data) def test_object_show(self): headers = { @@ -323,8 +330,7 @@ class TestObject(TestObjectAPIv1): 'content-length': '577', 'last-modified': '20130101', 'etag': 'qaz', - 'properties': {'wife': 'Wilma', - 'Husband': 'fred'}, + 'properties': {'wife': 'Wilma', 'Husband': 'fred'}, } self.requests_mock.register_uri( 'HEAD', |