python-openstackclient 6.6.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

openstackclient/tests/unit/network/v2/test_security_group_rule_network.py

@@ -25,12 +25,12 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestSecurityGroupRuleNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestSecurityGroupRuleNetwork, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
@@ -89,7 +89,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         )
 
     def setUp(self):
-        super(TestCreateSecurityGroupRuleNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_security_group = mock.Mock(
             return_value=self._security_group
@@ -103,9 +103,7 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         self.domains_mock.get.return_value = self.domain
 
         # Get the command object to test
-        self.cmd = security_group_rule.CreateSecurityGroupRule(
-            self.app, self.namespace
-        )
+        self.cmd = security_group_rule.CreateSecurityGroupRule(self.app, None)
 
     def test_create_no_options(self):
         self.assertRaises(
@@ -972,7 +970,7 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
     )
 
     def setUp(self):
-        super(TestDeleteSecurityGroupRuleNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.delete_security_group_rule = mock.Mock(
             return_value=None
@@ -985,9 +983,7 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         )
 
         # Get the command object to test
-        self.cmd = security_group_rule.DeleteSecurityGroupRule(
-            self.app, self.namespace
-        )
+        self.cmd = security_group_rule.DeleteSecurityGroupRule(self.app, None)
 
     def test_security_group_rule_delete(self):
         arglist = [
@@ -1146,7 +1142,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         )
 
     def setUp(self):
-        super(TestListSecurityGroupRuleNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_security_group = mock.Mock(
             return_value=self._security_group
@@ -1156,9 +1152,7 @@ class TestListSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         )
 
         # Get the command object to test
-        self.cmd = security_group_rule.ListSecurityGroupRule(
-            self.app, self.namespace
-        )
+        self.cmd = security_group_rule.ListSecurityGroupRule(self.app, None)
 
     def test_list_default(self):
         self._security_group_rule_tcp.port_range_min = 80
@@ -1305,16 +1299,14 @@ class TestShowSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
     )
 
     def setUp(self):
-        super(TestShowSecurityGroupRuleNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.find_security_group_rule = mock.Mock(
             return_value=self._security_group_rule
         )
 
         # Get the command object to test
-        self.cmd = security_group_rule.ShowSecurityGroupRule(
-            self.app, self.namespace
-        )
+        self.cmd = security_group_rule.ShowSecurityGroupRule(self.app, None)
 
     def test_show_no_options(self):
         self.assertRaises(

openstackclient/tests/unit/network/v2/test_subnet.py

@@ -25,12 +25,12 @@ from openstackclient.tests.unit import utils as tests_utils
 
 class TestSubnet(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestSubnet, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateSubnet(TestSubnet):
@@ -167,7 +167,7 @@ class TestCreateSubnet(TestSubnet):
             subnet_v2.AllocationPoolsColumn(self._subnet.allocation_pools),
             self._subnet.cidr,
             self._subnet.description,
-            format_columns.ListColumn(self._subnet.dns_nameservers),
+            subnet_v2.UnsortedListColumn(self._subnet.dns_nameservers),
             self._subnet.enable_dhcp,
             self._subnet.gateway_ip,
             subnet_v2.HostRoutesColumn(self._subnet.host_routes),
@@ -190,7 +190,9 @@ class TestCreateSubnet(TestSubnet):
             ),
             self._subnet_from_pool.cidr,
             self._subnet_from_pool.description,
-            format_columns.ListColumn(self._subnet_from_pool.dns_nameservers),
+            subnet_v2.UnsortedListColumn(
+                self._subnet_from_pool.dns_nameservers
+            ),
             self._subnet_from_pool.enable_dhcp,
             self._subnet_from_pool.gateway_ip,
             subnet_v2.HostRoutesColumn(self._subnet_from_pool.host_routes),
@@ -213,7 +215,7 @@ class TestCreateSubnet(TestSubnet):
             ),
             self._subnet_ipv6.cidr,
             self._subnet_ipv6.description,
-            format_columns.ListColumn(self._subnet_ipv6.dns_nameservers),
+            subnet_v2.UnsortedListColumn(self._subnet_ipv6.dns_nameservers),
             self._subnet_ipv6.enable_dhcp,
             self._subnet_ipv6.gateway_ip,
             subnet_v2.HostRoutesColumn(self._subnet_ipv6.host_routes),
@@ -236,7 +238,7 @@ class TestCreateSubnet(TestSubnet):
             ),
             self._subnet_ipv6_pd.cidr,
             self._subnet_ipv6_pd.description,
-            format_columns.ListColumn(self._subnet_ipv6_pd.dns_nameservers),
+            subnet_v2.UnsortedListColumn(self._subnet_ipv6_pd.dns_nameservers),
             self._subnet_ipv6_pd.enable_dhcp,
             self._subnet_ipv6_pd.gateway_ip,
             subnet_v2.HostRoutesColumn(self._subnet_ipv6_pd.host_routes),
@@ -255,10 +257,10 @@ class TestCreateSubnet(TestSubnet):
 
     def setUp(self):
         self._init_subnet_variables()
-        super(TestCreateSubnet, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = subnet_v2.CreateSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.CreateSubnet(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -717,7 +719,7 @@ class TestDeleteSubnet(TestSubnet):
     _subnets = network_fakes.FakeSubnet.create_subnets(count=2)
 
     def setUp(self):
-        super(TestDeleteSubnet, self).setUp()
+        super().setUp()
 
         self.network_client.delete_subnet = mock.Mock(return_value=None)
 
@@ -726,7 +728,7 @@ class TestDeleteSubnet(TestSubnet):
         )
 
         # Get the command object to test
-        self.cmd = subnet_v2.DeleteSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.DeleteSubnet(self.app, None)
 
     def test_subnet_delete(self):
         arglist = [
@@ -837,7 +839,7 @@ class TestListSubnet(TestSubnet):
                 subnet.cidr,
                 subnet.project_id,
                 subnet.enable_dhcp,
-                format_columns.ListColumn(subnet.dns_nameservers),
+                subnet_v2.UnsortedListColumn(subnet.dns_nameservers),
                 subnet_v2.AllocationPoolsColumn(subnet.allocation_pools),
                 subnet_v2.HostRoutesColumn(subnet.host_routes),
                 subnet.ip_version,
@@ -848,10 +850,10 @@ class TestListSubnet(TestSubnet):
         )
 
     def setUp(self):
-        super(TestListSubnet, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = subnet_v2.ListSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.ListSubnet(self.app, None)
 
         self.network_client.subnets = mock.Mock(return_value=self._subnet)
 
@@ -1179,11 +1181,11 @@ class TestSetSubnet(TestSubnet):
     )
 
     def setUp(self):
-        super(TestSetSubnet, self).setUp()
+        super().setUp()
         self.network_client.update_subnet = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
         self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
-        self.cmd = subnet_v2.SetSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.SetSubnet(self.app, None)
 
     def test_set_this(self):
         arglist = [
@@ -1489,7 +1491,7 @@ class TestShowSubnet(TestSubnet):
         subnet_v2.AllocationPoolsColumn(_subnet.allocation_pools),
         _subnet.cidr,
         _subnet.description,
-        format_columns.ListColumn(_subnet.dns_nameservers),
+        subnet_v2.UnsortedListColumn(_subnet.dns_nameservers),
         _subnet.enable_dhcp,
         _subnet.gateway_ip,
         subnet_v2.HostRoutesColumn(_subnet.host_routes),
@@ -1507,10 +1509,10 @@ class TestShowSubnet(TestSubnet):
     )
 
     def setUp(self):
-        super(TestShowSubnet, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = subnet_v2.ShowSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.ShowSubnet(self.app, None)
 
         self.network_client.find_subnet = mock.Mock(return_value=self._subnet)
 
@@ -1549,10 +1551,11 @@ class TestShowSubnet(TestSubnet):
 
 class TestUnsetSubnet(TestSubnet):
     def setUp(self):
-        super(TestUnsetSubnet, self).setUp()
+        super().setUp()
+        # Add three dns_nameserver entries so we can verify ordering
         self._testsubnet = network_fakes.FakeSubnet.create_one_subnet(
             {
-                'dns_nameservers': ['8.8.8.8', '8.8.8.4'],
+                'dns_nameservers': ['8.8.8.8', '8.8.8.4', '8.8.4.4'],
                 'host_routes': [
                     {'destination': '10.20.20.0/24', 'nexthop': '10.20.20.1'},
                     {'destination': '10.30.30.30/24', 'nexthop': '10.30.30.1'},
@@ -1575,12 +1578,13 @@ class TestUnsetSubnet(TestSubnet):
         self.network_client.update_subnet = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
         # Get the command object to test
-        self.cmd = subnet_v2.UnsetSubnet(self.app, self.namespace)
+        self.cmd = subnet_v2.UnsetSubnet(self.app, None)
 
     def test_unset_subnet_params(self):
+        # Remove just the middle dns_nameserver entry, verify still in order
         arglist = [
             '--dns-nameserver',
-            '8.8.8.8',
+            '8.8.8.4',
             '--host-route',
             'destination=10.30.30.30/24,gateway=10.30.30.1',
             '--allocation-pool',
@@ -1591,7 +1595,7 @@ class TestUnsetSubnet(TestSubnet):
             self._testsubnet.name,
         ]
         verifylist = [
-            ('dns_nameservers', ['8.8.8.8']),
+            ('dns_nameservers', ['8.8.8.4']),
             (
                 'host_routes',
                 [{"destination": "10.30.30.30/24", "gateway": "10.30.30.1"}],
@@ -1605,7 +1609,7 @@ class TestUnsetSubnet(TestSubnet):
         result = self.cmd.take_action(parsed_args)
 
         attrs = {
-            'dns_nameservers': ['8.8.8.4'],
+            'dns_nameservers': ['8.8.8.8', '8.8.4.4'],
             'host_routes': [
                 {"destination": "10.20.20.0/24", "nexthop": "10.20.20.1"}
             ],

openstackclient/tests/unit/network/v2/test_subnet_pool.py

@@ -24,12 +24,12 @@ from openstackclient.tests.unit import utils as test_utils
 
 class TestSubnetPool(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestSubnetPool, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         # Get a shortcut to the DomainManager Mock
-        self.domains_mock = self.app.client_manager.identity.domains
+        self.domains_mock = self.identity_client.domains
 
 
 class TestCreateSubnetPool(TestSubnetPool):
@@ -74,7 +74,7 @@ class TestCreateSubnetPool(TestSubnetPool):
     )
 
     def setUp(self):
-        super(TestCreateSubnetPool, self).setUp()
+        super().setUp()
 
         self.network_client.create_subnet_pool = mock.Mock(
             return_value=self._subnet_pool
@@ -82,7 +82,7 @@ class TestCreateSubnetPool(TestSubnetPool):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = subnet_pool.CreateSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.CreateSubnetPool(self.app, None)
 
         self.network_client.find_address_scope = mock.Mock(
             return_value=self._address_scope
@@ -385,7 +385,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
     _subnet_pools = network_fakes.FakeSubnetPool.create_subnet_pools(count=2)
 
     def setUp(self):
-        super(TestDeleteSubnetPool, self).setUp()
+        super().setUp()
 
         self.network_client.delete_subnet_pool = mock.Mock(return_value=None)
 
@@ -394,7 +394,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
         )
 
         # Get the command object to test
-        self.cmd = subnet_pool.DeleteSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.DeleteSubnetPool(self.app, None)
 
     def test_subnet_pool_delete(self):
         arglist = [
@@ -509,10 +509,10 @@ class TestListSubnetPool(TestSubnetPool):
         )
 
     def setUp(self):
-        super(TestListSubnetPool, self).setUp()
+        super().setUp()
 
         # Get the command object to test
-        self.cmd = subnet_pool.ListSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.ListSubnetPool(self.app, None)
 
         self.network_client.subnet_pools = mock.Mock(
             return_value=self._subnet_pools
@@ -732,7 +732,7 @@ class TestSetSubnetPool(TestSubnetPool):
     _address_scope = network_fakes.create_one_address_scope()
 
     def setUp(self):
-        super(TestSetSubnetPool, self).setUp()
+        super().setUp()
 
         self.network_client.update_subnet_pool = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
@@ -746,7 +746,7 @@ class TestSetSubnetPool(TestSubnetPool):
         )
 
         # Get the command object to test
-        self.cmd = subnet_pool.SetSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.SetSubnetPool(self.app, None)
 
     def test_set_this(self):
         arglist = [
@@ -1077,14 +1077,14 @@ class TestShowSubnetPool(TestSubnetPool):
     )
 
     def setUp(self):
-        super(TestShowSubnetPool, self).setUp()
+        super().setUp()
 
         self.network_client.find_subnet_pool = mock.Mock(
             return_value=self._subnet_pool
         )
 
         # Get the command object to test
-        self.cmd = subnet_pool.ShowSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.ShowSubnetPool(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -1118,7 +1118,7 @@ class TestShowSubnetPool(TestSubnetPool):
 
 class TestUnsetSubnetPool(TestSubnetPool):
     def setUp(self):
-        super(TestUnsetSubnetPool, self).setUp()
+        super().setUp()
         self._subnetpool = network_fakes.FakeSubnetPool.create_one_subnet_pool(
             {'tags': ['green', 'red']}
         )
@@ -1128,7 +1128,7 @@ class TestUnsetSubnetPool(TestSubnetPool):
         self.network_client.update_subnet_pool = mock.Mock(return_value=None)
         self.network_client.set_tags = mock.Mock(return_value=None)
         # Get the command object to test
-        self.cmd = subnet_pool.UnsetSubnetPool(self.app, self.namespace)
+        self.cmd = subnet_pool.UnsetSubnetPool(self.app, None)
 
     def _test_unset_tags(self, with_tags=True):
         if with_tags:

openstackclient/tests/unit/object/v1/fakes.py

@@ -82,7 +82,7 @@ object_upload_name = 'test-object-name'
 
 class TestObjectv1(utils.TestCommand):
     def setUp(self):
-        super(TestObjectv1, self).setUp()
+        super().setUp()
 
         self.app.client_manager.session = session.Session()
         self.app.client_manager.object_store = object_store.APIv1(

openstackclient/tests/unit/object/v1/test_container.py

@@ -25,7 +25,7 @@ AUTH_TOKEN = "foobar"
 AUTH_URL = "http://0.0.0.0"
 
 
-class FakeClient(object):
+class FakeClient:
     def __init__(self, endpoint=None, **kwargs):
         self.endpoint = AUTH_URL
         self.token = AUTH_TOKEN
@@ -35,7 +35,7 @@ class TestContainer(object_fakes.TestObjectv1):
     columns = ('Name',)
 
     def setUp(self):
-        super(TestContainer, self).setUp()
+        super().setUp()
         self.app.client_manager.object_store = object_store.APIv1(
             session=mock.Mock(),
             service_type="object-store",
@@ -48,7 +48,7 @@ class TestContainer(object_fakes.TestObjectv1):
 @mock.patch('openstackclient.api.object_store_v1.APIv1.container_delete')
 class TestContainerDelete(TestContainer):
     def setUp(self):
-        super(TestContainerDelete, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container.DeleteContainer(self.app, None)
@@ -132,7 +132,7 @@ class TestContainerDelete(TestContainer):
 @mock.patch('openstackclient.api.object_store_v1.APIv1.container_list')
 class TestContainerList(TestContainer):
     def setUp(self):
-        super(TestContainerList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container.ListContainer(self.app, None)
@@ -345,7 +345,7 @@ class TestContainerList(TestContainer):
 @mock.patch('openstackclient.api.object_store_v1.APIv1.container_show')
 class TestContainerShow(TestContainer):
     def setUp(self):
-        super(TestContainerShow, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container.ShowContainer(self.app, None)

openstackclient/tests/unit/object/v1/test_container_all.py

@@ -21,7 +21,7 @@ from openstackclient.tests.unit.object.v1 import fakes as object_fakes
 
 class TestContainerAll(object_fakes.TestObjectv1):
     def setUp(self):
-        super(TestContainerAll, self).setUp()
+        super().setUp()
 
         self.requests_mock = self.useFixture(fixture.Fixture())
 
@@ -34,7 +34,7 @@ class TestContainerCreate(TestContainerAll):
     )
 
     def setUp(self):
-        super(TestContainerCreate, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container_cmds.CreateContainer(self.app, None)
@@ -182,7 +182,7 @@ class TestContainerCreate(TestContainerAll):
 
 class TestContainerDelete(TestContainerAll):
     def setUp(self):
-        super(TestContainerDelete, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container_cmds.DeleteContainer(self.app, None)
@@ -242,7 +242,7 @@ class TestContainerList(TestContainerAll):
     columns = ('Name',)
 
     def setUp(self):
-        super(TestContainerList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container_cmds.ListContainer(self.app, None)
@@ -309,7 +309,7 @@ class TestContainerList(TestContainerAll):
 
 class TestContainerSave(TestContainerAll):
     def setUp(self):
-        super(TestContainerSave, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container_cmds.SaveContainer(self.app, None)
@@ -357,7 +357,7 @@ class TestContainerSave(TestContainerAll):
 
 class TestContainerShow(TestContainerAll):
     def setUp(self):
-        super(TestContainerShow, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = container_cmds.ShowContainer(self.app, None)

openstackclient/tests/unit/object/v1/test_object.py

@@ -27,7 +27,7 @@ AUTH_URL = "http://0.0.0.0"
 
 class TestObject(object_fakes.TestObjectv1):
     def setUp(self):
-        super(TestObject, self).setUp()
+        super().setUp()
         self.app.client_manager.object_store = object_store.APIv1(
             session=mock.Mock(),
             service_type="object-store",
@@ -41,7 +41,7 @@ class TestObjectList(TestObject):
     datalist = ((object_fakes.object_name_2,),)
 
     def setUp(self):
-        super(TestObjectList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = obj.ListObject(self.app, None)
@@ -323,7 +323,7 @@ class TestObjectList(TestObject):
 @mock.patch('openstackclient.api.object_store_v1.APIv1.object_show')
 class TestObjectShow(TestObject):
     def setUp(self):
-        super(TestObjectShow, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = obj.ShowObject(self.app, None)

openstackclient/tests/unit/object/v1/test_object_all.py

@@ -24,14 +24,14 @@ from openstackclient.tests.unit.object.v1 import fakes as object_fakes
 
 class TestObjectAll(object_fakes.TestObjectv1):
     def setUp(self):
-        super(TestObjectAll, self).setUp()
+        super().setUp()
 
         self.requests_mock = self.useFixture(fixture.Fixture())
 
 
 class TestObjectCreate(TestObjectAll):
     def setUp(self):
-        super(TestObjectCreate, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = object_cmds.CreateObject(self.app, None)
@@ -65,7 +65,7 @@ class TestObjectList(TestObjectAll):
     columns = ('Name',)
 
     def setUp(self):
-        super(TestObjectList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = object_cmds.ListObject(self.app, None)
@@ -140,7 +140,7 @@ class TestObjectList(TestObjectAll):
 
 class TestObjectShow(TestObjectAll):
     def setUp(self):
-        super(TestObjectShow, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = object_cmds.ShowObject(self.app, None)
@@ -208,7 +208,7 @@ class TestObjectShow(TestObjectAll):
 
 class TestObjectSave(TestObjectAll):
     def setUp(self):
-        super(TestObjectSave, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = object_cmds.SaveObject(self.app, None)

openstackclient/tests/unit/test_shell.py

@@ -142,7 +142,7 @@ class TestShell(osc_lib_test_utils.TestShell):
     shell_class_name = "openstackclient.shell.OpenStackShell"
 
     def setUp(self):
-        super(TestShell, self).setUp()
+        super().setUp()
         # TODO(dtroyer): remove this once the shell_class_patch patch is
         #                released in osc-lib
         mod_str, _sep, class_str = self.shell_class_name.rpartition('.')
@@ -228,7 +228,7 @@ class TestShell(osc_lib_test_utils.TestShell):
 
 class TestShellOptions(TestShell):
     def setUp(self):
-        super(TestShellOptions, self).setUp()
+        super().setUp()
         self.useFixture(osc_lib_test_utils.EnvFixture())
 
     def _test_options_init_app(self, test_opts):
@@ -290,7 +290,7 @@ class TestShellOptions(TestShell):
 
 class TestShellTokenAuthEnv(TestShell):
     def setUp(self):
-        super(TestShellTokenAuthEnv, self).setUp()
+        super().setUp()
         env = {
             "OS_TOKEN": DEFAULT_TOKEN,
             "OS_AUTH_URL": DEFAULT_AUTH_URL,
@@ -333,7 +333,7 @@ class TestShellTokenAuthEnv(TestShell):
 
 class TestShellTokenEndpointAuthEnv(TestShell):
     def setUp(self):
-        super(TestShellTokenEndpointAuthEnv, self).setUp()
+        super().setUp()
         env = {
             "OS_TOKEN": DEFAULT_TOKEN,
             "OS_ENDPOINT": DEFAULT_SERVICE_URL,
@@ -376,7 +376,7 @@ class TestShellTokenEndpointAuthEnv(TestShell):
 
 class TestShellCli(TestShell):
     def setUp(self):
-        super(TestShellCli, self).setUp()
+        super().setUp()
         env = {
             "OS_COMPUTE_API_VERSION": DEFAULT_COMPUTE_API_VERSION,
             "OS_IDENTITY_API_VERSION": DEFAULT_IDENTITY_API_VERSION,

openstackclient/tests/unit/utils.py

@@ -35,6 +35,9 @@ class CompareBySet(list):
 
 
 class TestCase(testtools.TestCase):
+    # provide additional context for failures
+    maxDiff = None
+
     def setUp(self):
         testtools.TestCase.setUp(self)
 
@@ -67,7 +70,7 @@ class TestCommand(TestCase):
     """Test cliff command classes"""
 
     def setUp(self):
-        super(TestCommand, self).setUp()
+        super().setUp()
         # Build up a fake app
         self.fake_stdout = fakes.FakeStdout()
         self.fake_log = fakes.FakeLog()

openstackclient/tests/unit/volume/test_find_resource.py

@@ -37,7 +37,7 @@ NAME = 'PhilSpector'
 
 class TestFindResourceVolumes(test_utils.TestCase):
     def setUp(self):
-        super(TestFindResourceVolumes, self).setUp()
+        super().setUp()
         api = mock.Mock()
         api.client = mock.Mock()
         api.client.get = mock.Mock()
@@ -62,7 +62,7 @@ class TestFindResourceVolumes(test_utils.TestCase):
 
 class TestFindResourceVolumeSnapshots(test_utils.TestCase):
     def setUp(self):
-        super(TestFindResourceVolumeSnapshots, self).setUp()
+        super().setUp()
         api = mock.Mock()
         api.client = mock.Mock()
         api.client.get = mock.Mock()

openstackclient/tests/unit/volume/v1/fakes.py

@@ -64,15 +64,14 @@ class FakeClientMixin:
         self.volume_client = self.app.client_manager.volume
 
 
-class TestVolumev1(FakeClientMixin, utils.TestCommand):
+class TestVolumev1(
+    identity_fakes.FakeClientMixin,
+    FakeClientMixin,
+    utils.TestCommand,
+):
     def setUp(self):
         super().setUp()
 
-        self.app.client_manager.identity = identity_fakes.FakeIdentityv2Client(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
-        )
-
         # avoid circular imports by defining this manually rather than using
         # openstackclient.tests.unit.image.v1.fakes.FakeClientMixin
         self.app.client_manager.image = mock.Mock(spec=image_v1_proxy.Proxy)