openstack/barbican-tempest-plugin
Code Issues Proposed changes

Update hacking for Python3

Browse Source 
The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Change-Id: Ia59a23a36ebb8548a20e894000f7342c73012eac
This commit is contained in:
jacky06 2019-01-04 23:55:03 +08:00 committed by Douglas Mendizábal
parent 53dcab70f2
commit a318f6d77c
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -27,6 +27,7 @@
devstack_plugins: devstack_plugins:
barbican: https://opendev.org/openstack/barbican barbican: https://opendev.org/openstack/barbican
devstack_localrc: devstack_localrc:
USE_PYTHON3: true
NOVA_BACKEND: LVM NOVA_BACKEND: LVM
LVM_VOLUME_CLEAR: none LVM_VOLUME_CLEAR: none
devstack_local_conf: devstack_local_conf:

5
barbican_tempest_plugin/tests/scenario/manager.py
View File

@ -396,8 +396,9 @@ class ScenarioTest(manager.NetworkScenarioTest):
addresses = (server['addresses'][network['name']] addresses = (server['addresses'][network['name']]
if network else []) if network else [])
for address in addresses: for address in addresses:
if (address['version'] == CONF.validation.ip_version_for_ssh ip_version_for_ssh = CONF.validation.ip_version_for_ssh
and address['OS-EXT-IPS:type'] == 'fixed'): if (address['version'] == ip_version_for_ssh and
address['OS-EXT-IPS:type'] == 'fixed'):
return address['addr'] return address['addr']
raise exceptions.ServerUnreachable(server_id=server['id']) raise exceptions.ServerUnreachable(server_id=server['id'])
else: else:

6
test-requirements.txt
View File

@ -2,11 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking<0.13,>=0.12.0 # Apache-2.0 hacking>=3.2.0,<3.3.0 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0

3
tox.ini
View File

@ -26,8 +26,9 @@ commands = oslo_debug_helper {posargs}
[flake8] [flake8]
# E123, E125 skipped as they are invalid PEP-8. # E123, E125 skipped as they are invalid PEP-8.
# W504 line break after binary operator
show-source = True show-source = True
ignore = E123,E125 ignore = E123,E125,W504
builtins = _ builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build