openstack/swift
Code Issues Proposed changes

Merge "clean up saio env. after runnning func tests"

Browse Source
This commit is contained in:
Jenkins
2014-07-16 19:20:15 +00:00
committed by Gerrit Code Review
parent 9fdd86bf44 e5d90a9cc3
commit 82f4610ff7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/functional/__init__.py
View File

@@ -32,7 +32,8 @@ from shutil import rmtree
from tempfile import mkdtemp from tempfile import mkdtemp
from test import get_config from test import get_config
from test.functional.swift_test_client import Connection, ResponseError from test.functional.swift_test_client import Account, Connection, \
ResponseError
# This has the side effect of mocking out the xattr module so that unit tests # This has the side effect of mocking out the xattr module so that unit tests
# (and in this case, when in-process functional tests are called for) can run # (and in this case, when in-process functional tests are called for) can run
# on file systems that don't support extended attributes. # on file systems that don't support extended attributes.
@@ -513,6 +514,12 @@ def teardown_package():
global orig_collate global orig_collate
locale.setlocale(locale.LC_COLLATE, orig_collate) locale.setlocale(locale.LC_COLLATE, orig_collate)
# clean up containers and objects left behind after running tests
conn = Connection(config)
conn.authenticate()
account = Account(conn, config.get('account', config['username']))
account.delete_containers()
global in_process global in_process
if in_process: if in_process:
try: try: