openstack/swift
Code Issues Proposed changes

Merge "Silence SkipTest noise in in-process test teardown"

Browse Source
This commit is contained in:
Jenkins 2016-03-07 19:36:40 +00:00 committed by Gerrit Code Review
commit 6cfb8557a8
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/functional/__init__.py
View File

@ -577,10 +577,13 @@ def setup_package():
# if the test.conf file is not found, or does not provide a usable # if the test.conf file is not found, or does not provide a usable
# configuration. # configuration.
config.update(get_config('func_test')) config.update(get_config('func_test'))
if config: if not config:
in_process = False
else:
in_process = True in_process = True
# else... leave in_process value unchanged. It may be that
# setup_package is called twice, in which case in_process_setup may
# have loaded config before we reach here a second time, so the
# existence of config is not reliable to determine that in_process
# should be False. Anyway, it's default value is False.
else: else:
# Explicitly set to False, do not attempt to use in-process # Explicitly set to False, do not attempt to use in-process
# functional tests, be sure we attempt to read from local # functional tests, be sure we attempt to read from local
@ -775,10 +778,12 @@ def teardown_package():
# clean up containers and objects left behind after running tests # clean up containers and objects left behind after running tests
global config global config
conn = Connection(config)
conn.authenticate() if config:
account = Account(conn, config.get('account', config['username'])) conn = Connection(config)
account.delete_containers() conn.authenticate()
account = Account(conn, config.get('account', config['username']))
account.delete_containers()
global in_process global in_process
global _test_socks global _test_socks