openstack
/
ironic-inspector
Code Issues Proposed changes

Use auth_strategy=noauth in functional tests 

The way we mock it got broken by keystonemiddleware==2.3.1

Change-Id: I8ae8eae94329138ec840fa27ff49ec62a151bf5e
Closes-Bug: #1503377
This commit is contained in:
Dmitry Tantsur 2015-10-06 19:35:19 +02:00
parent 6631b8ffab
commit 96c4e94b35
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ironic_inspector/test/functional.py
View File

@ -45,6 +45,7 @@ manage_firewall = False
enable_setting_ipmi_credentials = True enable_setting_ipmi_credentials = True
[DEFAULT] [DEFAULT]
debug = True debug = True
auth_strategy = noauth
[database] [database]
connection = sqlite:///%(db_file)s connection = sqlite:///%(db_file)s
""" """
@ -364,32 +365,31 @@ def mocked_server():
content = CONF % {'db_file': db_file} content = CONF % {'db_file': db_file}
fp.write(content.encode('utf-8')) fp.write(content.encode('utf-8'))
with mock.patch.object(utils, 'check_auth'): with mock.patch.object(utils, 'get_client'):
with mock.patch.object(utils, 'get_client'): dbsync.main(args=['--config-file', conf_file, 'upgrade'])
dbsync.main(args=['--config-file', conf_file, 'upgrade'])
cfg.CONF.reset() cfg.CONF.reset()
cfg.CONF.unregister_opt(dbsync.command_opt) cfg.CONF.unregister_opt(dbsync.command_opt)
eventlet.greenthread.spawn_n(main.main, eventlet.greenthread.spawn_n(main.main,
args=['--config-file', conf_file], args=['--config-file', conf_file],
in_functional_test=True) in_functional_test=True)
eventlet.greenthread.sleep(1) eventlet.greenthread.sleep(1)
# Wait for service to start up to 30 seconds # Wait for service to start up to 30 seconds
for i in range(10): for i in range(10):
try: try:
requests.get('http://127.0.0.1:5050/v1') requests.get('http://127.0.0.1:5050/v1')
except requests.ConnectionError: except requests.ConnectionError:
if i == 9: if i == 9:
raise raise
print('Service did not start yet') print('Service did not start yet')
eventlet.greenthread.sleep(3) eventlet.greenthread.sleep(3)
else: else:
break break
# start testing # start testing
yield yield
# Make sure all processes finished executing # Make sure all processes finished executing
eventlet.greenthread.sleep(1) eventlet.greenthread.sleep(1)
finally: finally:
shutil.rmtree(d) shutil.rmtree(d)