openstack/charm-keystone
Code Issues Proposed changes

Unpin flake8 and fix lint

Browse Source 
Change-Id: Iacae0fc791003d7f1730363f10f509434b0e671f
This commit is contained in:
Frode Nordahl 2020-03-10 10:50:27 +01:00
parent dc2f5e5259
commit 3765c0b123
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
8 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/actions.py
View File

@ -26,6 +26,7 @@ def _add_path(path):
if path not in sys.path: if path not in sys.path:
sys.path.insert(1, path) sys.path.insert(1, path)
_add_path(_hooks) _add_path(_hooks)
_add_path(_root) _add_path(_root)

2
actions/openstack_upgrade.py
View File

@ -26,6 +26,7 @@ def _add_path(path):
if path not in sys.path: if path not in sys.path:
sys.path.insert(1, path) sys.path.insert(1, path)
_add_path(_hooks) _add_path(_hooks)
_add_path(_root) _add_path(_root)
@ -56,5 +57,6 @@ def openstack_upgrade():
os.execl('./hooks/config-changed-postupgrade', os.execl('./hooks/config-changed-postupgrade',
'config-changed-postupgrade') 'config-changed-postupgrade')
if __name__ == '__main__': if __name__ == '__main__':
openstack_upgrade() openstack_upgrade()

1
actions/security_checklist.py
View File

@ -175,5 +175,6 @@ def main():
[config['config_path'], config['config_file']]) [config['config_path'], config['config_file']])
return audits.action_parse_results(audits.run(config)) return audits.action_parse_results(audits.run(config))
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())

4
hooks/keystone_utils.py
View File

@ -881,7 +881,7 @@ def get_admin_token():
if l.split(' ')[0] == 'admin_token': if l.split(' ')[0] == 'admin_token':
try: try:
return l.split('=')[1].strip() return l.split('=')[1].strip()
except: except Exception:
error_out('Could not parse admin_token line from %s' % error_out('Could not parse admin_token line from %s' %
KEYSTONE_CONF) KEYSTONE_CONF)
error_out('Could not find admin_token line in %s' % KEYSTONE_CONF) error_out('Could not find admin_token line in %s' % KEYSTONE_CONF)
@ -2195,7 +2195,7 @@ def check_extra_for_assess_status(configs):
if relation_ids('ha'): if relation_ids('ha'):
try: try:
get_hacluster_config() get_hacluster_config()
except: except Exception:
return ('blocked', return ('blocked',
'hacluster missing configuration: ' 'hacluster missing configuration: '
'vip, vip_iface, vip_cidr') 'vip, vip_iface, vip_cidr')

2
test-requirements.txt
View File

@ -10,7 +10,7 @@
charm-tools>=2.4.4 charm-tools>=2.4.4
requests>=2.18.4 requests>=2.18.4
mock>=1.2 mock>=1.2
flake8>=2.2.4,<=2.4.1 flake8>=2.2.4
stestr>=2.2.0 stestr>=2.2.0
coverage>=4.5.2 coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)

2
tox.ini
View File

@ -111,5 +111,5 @@ commands =
functest-run-suite --keep-model --bundle {posargs} functest-run-suite --keep-model --bundle {posargs}
[flake8] [flake8]
ignore = E402,E226 ignore = E402,E226,W504
exclude = */charmhelpers exclude = */charmhelpers

1
unit_tests/__init__.py
View File

@ -27,6 +27,7 @@ def _add_path(path):
if path not in sys.path: if path not in sys.path:
sys.path.insert(1, path) sys.path.insert(1, path)
_add_path(_actions) _add_path(_actions)
_add_path(_hooks) _add_path(_hooks)
_add_path(_charmhelpers) _add_path(_charmhelpers)