openstack
/
tempest
Code Issues Proposed changes

Fix code to pass pep8 Tox environment. 

Command tox -e pep8 is failing making CI to fail: this fixes it.

Change-Id: I5b1acfc4ba2e0eb16f50bfd1cdaa8edc361923d1
This commit is contained in:
Federico Ressi 2018-04-11 12:37:36 +02:00
parent 1dbff8a530
commit 2d6bcaa7e5
14 changed files with 66 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/compute/servers/test_device_tagging.py
View File

@ -47,8 +47,8 @@ class DeviceTaggingTest(base.BaseV2ComputeTest):
raise cls.skipException('Neutron is required')
if not CONF.validation.run_validation:
raise cls.skipException('Validation must be enabled')
if (not CONF.compute_feature_enabled.config_drive
and not CONF.compute_feature_enabled.metadata_service):
if (not CONF.compute_feature_enabled.config_drive and
not CONF.compute_feature_enabled.metadata_service):
raise cls.skipException('One of metadata or config drive must be '
'enabled')

12
tempest/api/image/v1/test_images.py
View File

@ -132,8 +132,8 @@ class ListImagesTest(base.BaseV1ImageTest):
@classmethod
def skip_checks(cls):
super(ListImagesTest, cls).skip_checks()
if (len(CONF.image.container_formats) < 2
or len(CONF.image.disk_formats) < 2):
if (len(CONF.image.container_formats) < 2 or
len(CONF.image.disk_formats) < 2):
skip_msg = ("%s skipped as multiple container formats "
"or disk formats are not available." % cls.__name__)
raise cls.skipException(skip_msg)
@ -227,8 +227,8 @@ class ListImagesTest(base.BaseV1ImageTest):
self.assertEqual(image['disk_format'], self.disk_format_alt)
result_set = set(map(lambda x: x['id'], images_list))
self.assertTrue(self.same_disk_format_set <= result_set)
self.assertFalse(self.created_set - self.same_disk_format_set
<= result_set)
self.assertFalse(self.created_set - self.same_disk_format_set <=
result_set)
@decorators.idempotent_id('2143655d-96d9-4bec-9188-8674206b4b3b')
def test_index_container_format(self):
@ -238,8 +238,8 @@ class ListImagesTest(base.BaseV1ImageTest):
self.assertEqual(image['container_format'], self.container_format)
result_set = set(map(lambda x: x['id'], images_list))
self.assertTrue(self.same_container_format_set <= result_set)
self.assertFalse(self.created_set - self.same_container_format_set
<= result_set)
self.assertFalse(self.created_set - self.same_container_format_set <=
result_set)
@decorators.idempotent_id('feb32ac6-22bb-4a16-afd8-9454bb714b14')
def test_index_max_size(self):

4
tempest/api/volume/admin/test_volume_hosts.py
View File

@ -46,8 +46,8 @@ class VolumeHostsAdminTestsJSON(base.BaseVolumeAdminTest):
# show host API should fail (return code: 404). The cinder-volume host
# is presented in format: <host-name>@driver-name.
c_vol_hosts = [host['host_name'] for host in hosts
if (host['service'] == 'cinder-volume'
and host['service-state'] == 'enabled')]
if (host['service'] == 'cinder-volume' and
host['service-state'] == 'enabled')]
self.assertNotEmpty(c_vol_hosts,
"No available cinder-volume host is found, "
"all hosts that found are: %s" % hosts)

27
tempest/cmd/cleanup_service.py
View File

@ -104,11 +104,11 @@ class BaseService(object):
self.tenant_filter['tenant_id'] = self.tenant_id
def _filter_by_tenant_id(self, item_list):
if (item_list is None
or not item_list
or not hasattr(self, 'tenant_id')
or self.tenant_id is None
or 'tenant_id' not in item_list[0]):
if (item_list is None or
not item_list or
not hasattr(self, 'tenant_id') or
self.tenant_id is None or
'tenant_id' not in item_list[0]):
return item_list
return [item for item in item_list
@ -816,8 +816,8 @@ class RoleService(BaseService):
if not self.is_save_state:
roles = [role for role in roles if
(role['id'] not in
self.saved_state_json['roles'].keys()
and role['name'] != CONF.identity.admin_role)]
self.saved_state_json['roles'].keys() and
role['name'] != CONF.identity.admin_role)]
LOG.debug("List count, %s Roles after reconcile", len(roles))
return roles
except Exception:
@ -852,13 +852,16 @@ class ProjectService(BaseService):
def list(self):
projects = self.client.list_projects()['projects']
if not self.is_save_state:
projects = [project for project in projects if (project['id']
not in self.saved_state_json['projects'].keys()
and project['name'] != CONF.auth.admin_project_name)]
project_ids = self.saved_state_json['projects']
projects = [project
for project in projects
if (project['id'] not in project_ids and
project['name'] != CONF.auth.admin_project_name)]
if self.is_preserve:
projects = [project for project in projects if project['name']
not in CONF_PROJECTS]
projects = [project
for project in projects
if project['name'] not in CONF_PROJECTS]
LOG.debug("List count, %s Projects after reconcile", len(projects))
return projects

14
tempest/hacking/checks.py
View File

@ -228,12 +228,12 @@ def dont_import_local_tempest_into_lib(logical_line, filename):
if 'tempest/lib/' not in filename:
return
if not ('from tempest' in logical_line
or 'import tempest' in logical_line):
if not ('from tempest' in logical_line or
'import tempest' in logical_line):
return
if ('from tempest.lib' in logical_line
or 'import tempest.lib' in logical_line):
if ('from tempest.lib' in logical_line or
'import tempest.lib' in logical_line):
return
msg = ("T112: tempest.lib should not import local tempest code to avoid "
@ -266,9 +266,9 @@ def dont_use_config_in_tempest_lib(logical_line, filename):
if 'tempest/lib/' not in filename:
return
if ('tempest.config' in logical_line
or 'from tempest import config' in logical_line
or 'oslo_config' in logical_line):
if ('tempest.config' in logical_line or
'from tempest import config' in logical_line or
'oslo_config' in logical_line):
msg = ('T114: tempest.lib can not have any dependency on tempest '
'config.')
yield(0, msg)

3
tempest/lib/base.py
View File

@ -43,8 +43,7 @@ class BaseTestCase(testtools.testcase.WithAttributes, testtools.TestCase):
super(BaseTestCase, self).setUp()
if not self.setUpClassCalled:
raise RuntimeError("setUpClass does not calls the super's "
"setUpClass in the "
+ self.__class__.__name__)
"setUpClass in {!r}".format(type(self)))
test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
try:
test_timeout = int(test_timeout)

4
tempest/lib/cli/output_parser.py
View File

@ -37,8 +37,8 @@ def details_multiple(output_lines, with_label=False):
items = []
tables_ = tables(output_lines)
for table_ in tables_:
if ('Property' not in table_['headers']
or 'Value' not in table_['headers']):
if ('Property' not in table_['headers'] or
'Value' not in table_['headers']):
raise exceptions.InvalidStructure()
item = {}
for value in table_['values']:

6
tempest/lib/cmd/check_uuid.py
View File

@ -103,7 +103,7 @@ class TestChecker(object):
def _modules_search(self):
"""Recursive search for python modules in base package"""
modules = []
for root, dirs, files in os.walk(self.base_path):
for root, _, files in os.walk(self.base_path):
if not os.path.exists(os.path.join(root, '__init__.py')):
continue
root_package = self._path_to_package(root)
@ -165,8 +165,8 @@ class TestChecker(object):
@staticmethod
def _is_test_method(node):
return (node.__class__ is ast.FunctionDef
and node.name.startswith('test_'))
return (node.__class__ is ast.FunctionDef and
node.name.startswith('test_'))
@staticmethod
def _next_node(body, node):

10
tempest/lib/common/dynamic_creds.py
View File

@ -338,15 +338,15 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
credentials = self._create_creds(roles=credential_type)
self._creds[str(credential_type)] = credentials
# Maintained until tests are ported
LOG.info("Acquired dynamic creds:\n credentials: %s", credentials)
if (self.neutron_available and
self.create_networks):
LOG.info("Acquired dynamic creds:\n"
" credentials: %s", credentials)
if (self.neutron_available and self.create_networks):
network, subnet, router = self._create_network_resources(
credentials.tenant_id)
credentials.set_resources(network=network, subnet=subnet,
router=router)
LOG.info("Created isolated network resources for : \n"
+ " credentials: %s", credentials)
LOG.info("Created isolated network resources for:\n"
" credentials: %s", credentials)
return credentials
def get_primary_creds(self):

8
tempest/scenario/manager.py
View File

@ -662,8 +662,8 @@ class ScenarioTest(tempest.test.BaseTestCase):
addresses = (server['addresses'][network['name']]
if network else [])
for address in addresses:
if (address['version'] == CONF.validation.ip_version_for_ssh
and address['OS-EXT-IPS:type'] == 'fixed'):
if (address['version'] == CONF.validation.ip_version_for_ssh and # noqa
address['OS-EXT-IPS:type'] == 'fixed'):
return address['addr']
raise exceptions.ServerUnreachable(server_id=server['id'])
else:
@ -792,8 +792,8 @@ class NetworkScenarioTest(ScenarioTest):
port_map = [(p["id"], fxip["ip_address"])
for p in ports
for fxip in p["fixed_ips"]
if netutils.is_valid_ipv4(fxip["ip_address"])
and p['status'] in p_status]
if (netutils.is_valid_ipv4(fxip["ip_address"]) and
p['status'] in p_status)]
inactive = [p for p in ports if p['status'] != 'ACTIVE']
if inactive:
LOG.warning("Instance has ports that are not ACTIVE: %s", inactive)

4
tempest/scenario/test_network_advanced_server_ops.py
View File

@ -43,8 +43,8 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
@classmethod
def skip_checks(cls):
super(TestNetworkAdvancedServerOps, cls).skip_checks()
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
if not (CONF.network.project_networks_reachable or
CONF.network.public_network_id):
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
raise cls.skipException(msg)

4
tempest/scenario/test_network_basic_ops.py
View File

@ -81,8 +81,8 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
@classmethod
def skip_checks(cls):
super(TestNetworkBasicOps, cls).skip_checks()
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
if not (CONF.network.project_networks_reachable or
CONF.network.public_network_id):
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
raise cls.skipException(msg)

8
tempest/scenario/test_network_v6.py
View File

@ -38,11 +38,11 @@ class TestGettingAddress(manager.NetworkScenarioTest):
@classmethod
def skip_checks(cls):
super(TestGettingAddress, cls).skip_checks()
if not (CONF.network_feature_enabled.ipv6
and CONF.network_feature_enabled.ipv6_subnet_attributes):
if not (CONF.network_feature_enabled.ipv6 and
CONF.network_feature_enabled.ipv6_subnet_attributes):
raise cls.skipException('IPv6 or its attributes not supported')
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
if not (CONF.network.project_networks_reachable or
CONF.network.public_network_id):
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
raise cls.skipException(msg)

10
tempest/test.py
View File

@ -68,9 +68,9 @@ at_exit_set = set()
def validate_tearDownClass():
if at_exit_set:
LOG.error(
"tearDownClass does not call the super's "
"tearDownClass in these classes: \n"
+ str(at_exit_set))
"tearDownClass does not call the super's tearDownClass in "
"these classes:\n"
" %s", at_exit_set)
atexit.register(validate_tearDownClass)
@ -582,8 +582,8 @@ class BaseTestCase(testtools.testcase.WithAttributes,
super(BaseTestCase, self).setUp()
if not self.__setupclass_called:
raise RuntimeError("setUpClass does not calls the super's"
"setUpClass in the "
+ self.__class__.__name__)
"setUpClass in the " +
self.__class__.__name__)
at_exit_set.add(self.__class__)
test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
try: