diff options
Diffstat (limited to 'openstackclient/tests/functional/common')
5 files changed, 58 insertions, 63 deletions
diff --git a/openstackclient/tests/functional/common/test_availability_zone.py b/openstackclient/tests/functional/common/test_availability_zone.py index f319ffc5..cce1b261 100644 --- a/openstackclient/tests/functional/common/test_availability_zone.py +++ b/openstackclient/tests/functional/common/test_availability_zone.py @@ -14,7 +14,7 @@ from openstackclient.tests.functional import base class AvailabilityZoneTests(base.TestCase): - """Functional tests for availability zone. """ + """Functional tests for availability zone.""" def test_availability_zone_list(self): cmd_output = self.openstack( @@ -22,11 +22,5 @@ class AvailabilityZoneTests(base.TestCase): parse_output=True, ) zones = [x['Zone Name'] for x in cmd_output] - self.assertIn( - 'internal', - zones - ) - self.assertIn( - 'nova', - zones - ) + self.assertIn('internal', zones) + self.assertIn('nova', zones) diff --git a/openstackclient/tests/functional/common/test_configuration.py b/openstackclient/tests/functional/common/test_configuration.py index 614b3e46..2a4660a4 100644 --- a/openstackclient/tests/functional/common/test_configuration.py +++ b/openstackclient/tests/functional/common/test_configuration.py @@ -23,17 +23,13 @@ class ConfigurationTests(base.TestCase): """Functional test for configuration.""" def test_configuration_show(self): - # Test show without option raw_output = self.openstack('configuration show') items = self.parse_listing(raw_output) self.assert_table_structure(items, BASIC_CONFIG_HEADERS) cmd_output = self.openstack('configuration show', parse_output=True) - self.assertEqual( - configuration.REDACTED, - cmd_output['auth.password'] - ) + self.assertEqual(configuration.REDACTED, cmd_output['auth.password']) self.assertIn( 'auth.password', cmd_output.keys(), @@ -41,30 +37,25 @@ class ConfigurationTests(base.TestCase): # Test show --mask cmd_output = self.openstack( - 'configuration show --mask', parse_output=True, - ) - self.assertEqual( - configuration.REDACTED, - cmd_output['auth.password'] + 'configuration show --mask', + parse_output=True, ) + self.assertEqual(configuration.REDACTED, cmd_output['auth.password']) # Test show --unmask cmd_output = self.openstack( - 'configuration show --unmask', parse_output=True, + 'configuration show --unmask', + parse_output=True, ) # If we are using os-client-config, this will not be set. Rather than # parse clouds.yaml to get the right value, just make sure # we are not getting redacted. passwd = os.environ.get('OS_PASSWORD') if passwd: - self.assertEqual( - passwd, - cmd_output['auth.password'] - ) + self.assertEqual(passwd, cmd_output['auth.password']) else: self.assertNotEqual( - configuration.REDACTED, - cmd_output['auth.password'] + configuration.REDACTED, cmd_output['auth.password'] ) @@ -72,7 +63,6 @@ class ConfigurationTestsNoAuth(base.TestCase): """Functional test for configuration with no auth""" def test_configuration_show(self): - # Test show without option raw_output = self.openstack( 'configuration show', diff --git a/openstackclient/tests/functional/common/test_help.py b/openstackclient/tests/functional/common/test_help.py index e84c22e0..0df3b5be 100644 --- a/openstackclient/tests/functional/common/test_help.py +++ b/openstackclient/tests/functional/common/test_help.py @@ -27,8 +27,10 @@ class HelpTests(base.TestCase): ('server create', 'Create a new server'), ('server delete', 'Delete server(s)'), ('server dump create', 'Create a dump file in server(s)'), - ('server image create', - 'Create a new server disk image from an existing server'), + ( + 'server image create', + 'Create a new server disk image from an existing server', + ), ('server list', 'List servers'), ('server lock', 'Lock server(s)'), ('server migrate', 'Migrate server to different host'), @@ -51,7 +53,7 @@ class HelpTests(base.TestCase): ('server unpause', 'Unpause server(s)'), ('server unrescue', 'Restore server from rescue mode'), ('server unset', 'Unset server properties'), - ('server unshelve', 'Unshelve server(s)') + ('server unshelve', 'Unshelve server(s)'), ] def test_server_commands_main_help(self): @@ -59,10 +61,14 @@ class HelpTests(base.TestCase): raw_output = self.openstack('help') for command, description in self.SERVER_COMMANDS: msg = 'Command: %s not found in help output:\n%s' % ( - command, raw_output) + command, + raw_output, + ) self.assertIn(command, raw_output, msg) msg = 'Description: %s not found in help output:\n%s' % ( - description, raw_output) + description, + raw_output, + ) self.assertIn(description, raw_output, msg) def test_server_only_help(self): diff --git a/openstackclient/tests/functional/common/test_module.py b/openstackclient/tests/functional/common/test_module.py index 967d3b49..0cb37391 100644 --- a/openstackclient/tests/functional/common/test_module.py +++ b/openstackclient/tests/functional/common/test_module.py @@ -18,13 +18,9 @@ from openstackclient.tests.functional import base class ModuleTest(base.TestCase): """Functional tests for openstackclient module list output.""" - CLIENTS = ['openstackclient', - 'keystoneclient', - 'novaclient', - 'openstack'] + CLIENTS = ['openstackclient', 'keystoneclient', 'novaclient', 'openstack'] - LIBS = ['osc_lib', - 'keystoneauth1'] + LIBS = ['osc_lib', 'keystoneauth1'] def test_module_list(self): # Test module list @@ -42,6 +38,7 @@ class ModuleTest(base.TestCase): class CommandTest(base.TestCase): """Functional tests for openstackclient command list.""" + GROUPS = [ 'openstack.volume.v3', 'openstack.network.v2', @@ -59,13 +56,7 @@ class CommandTest(base.TestCase): self.assertIn(one_group, group_names) def test_command_list_with_group(self): - input_groups = [ - 'volume', - 'network', - 'image', - 'identity', - 'compute.v2' - ] + input_groups = ['volume', 'network', 'image', 'identity', 'compute.v2'] for each_input in input_groups: cmd_output = self.openstack( 'command list --group %s' % each_input, diff --git a/openstackclient/tests/functional/common/test_quota.py b/openstackclient/tests/functional/common/test_quota.py index 6e48df1d..5cc1b4ee 100644 --- a/openstackclient/tests/functional/common/test_quota.py +++ b/openstackclient/tests/functional/common/test_quota.py @@ -30,8 +30,9 @@ class QuotaTests(base.TestCase): def setUpClass(cls): super(QuotaTests, cls).setUpClass() cls.haz_network = cls.is_service_enabled('network') - cls.PROJECT_NAME =\ - cls.get_openstack_configuration_value('auth.project_name') + cls.PROJECT_NAME = cls.get_openstack_configuration_value( + 'auth.project_name' + ) def test_quota_list_details_compute(self): expected_headers = ["Resource", "In Use", "Reserved", "Limit"] @@ -111,9 +112,9 @@ class QuotaTests(base.TestCase): if self.haz_network: network_option = "--routers 21 " self.openstack( - 'quota set --cores 31 --backups 41 ' + - network_option + - self.PROJECT_NAME + 'quota set --cores 31 --backups 41 ' + + network_option + + self.PROJECT_NAME ) cmd_output = self.openstack( 'quota show ' + self.PROJECT_NAME, @@ -151,8 +152,7 @@ class QuotaTests(base.TestCase): def test_quota_set_class(self): self.openstack( - 'quota set --key-pairs 33 --snapshots 43 ' + - '--class default' + 'quota set --key-pairs 33 --snapshots 43 ' + '--class default' ) cmd_output = self.openstack( 'quota show --class default', @@ -194,8 +194,12 @@ class QuotaTests(base.TestCase): 'quota list --network', parse_output=True, ) - self.addCleanup(self._restore_quota_limit, 'network', - cmd_output[0]['Networks'], self.PROJECT_NAME) + self.addCleanup( + self._restore_quota_limit, + 'network', + cmd_output[0]['Networks'], + self.PROJECT_NAME, + ) self.openstack('quota set --networks 40 ' + self.PROJECT_NAME) cmd_output = self.openstack( @@ -207,12 +211,16 @@ class QuotaTests(base.TestCase): # That will ensure we have at least two networks in the system. for _ in range(2): - self.openstack('network create --project %s %s' % - (self.PROJECT_NAME, uuid.uuid4().hex)) + self.openstack( + 'network create --project %s %s' + % (self.PROJECT_NAME, uuid.uuid4().hex) + ) - self.assertRaises(exceptions.CommandFailed, self.openstack, - 'quota set --networks 1 --no-force ' + - self.PROJECT_NAME) + self.assertRaises( + exceptions.CommandFailed, + self.openstack, + 'quota set --networks 1 --no-force ' + self.PROJECT_NAME, + ) def test_quota_network_set_with_force(self): self.skipTest('story 2010110') @@ -232,8 +240,12 @@ class QuotaTests(base.TestCase): 'quota list --network', parse_output=True, ) - self.addCleanup(self._restore_quota_limit, 'network', - cmd_output[0]['Networks'], self.PROJECT_NAME) + self.addCleanup( + self._restore_quota_limit, + 'network', + cmd_output[0]['Networks'], + self.PROJECT_NAME, + ) self.openstack('quota set --networks 40 ' + self.PROJECT_NAME) cmd_output = self.openstack( @@ -245,8 +257,10 @@ class QuotaTests(base.TestCase): # That will ensure we have at least two networks in the system. for _ in range(2): - self.openstack('network create --project %s %s' % - (self.PROJECT_NAME, uuid.uuid4().hex)) + self.openstack( + 'network create --project %s %s' + % (self.PROJECT_NAME, uuid.uuid4().hex) + ) self.openstack('quota set --networks 1 --force ' + self.PROJECT_NAME) cmd_output = self.openstack( |