fix functional tests to cleanup containers

Current tests from upstream swift leave containers in the
database after they are done running.

This causes an issue with sof tests because we clean up the
tests directory /mnt/swiftonfile. When running the
functional tests a second time always fails because the
setup functions tries to delete existing containers,
but the sof object servers returns 404, thus causing
the whole test to fail.

Signed-off-by: Thiago da Silva <thiago@redhat.com>
This commit is contained in:
Thiago da Silva 2014-07-10 15:37:08 -04:00
parent db257f8826
commit 09affa3951

View File

@ -119,6 +119,10 @@ class TestAccount(Base):
env = TestAccountEnv
set_up = False
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def testNoAuthToken(self):
self.assertRaises(ResponseError, self.env.account.info,
cfg={'no_auth_token': True})
@ -352,6 +356,10 @@ class TestContainer(Base):
env = TestContainerEnv
set_up = False
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def testContainerNameLimit(self):
limit = load_constraint('max_container_name_length')
@ -817,6 +825,10 @@ class TestFile(Base):
env = TestFileEnv
set_up = False
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def testCopy(self):
# makes sure to test encoded characters
source_filename = 'dealde%2Fl04 011e%204c8df/flash.png'
@ -1535,6 +1547,10 @@ class TestDlo(Base):
env = TestDloEnv
set_up = False
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def test_get_manifest(self):
file_item = self.env.container.file('man1')
file_contents = file_item.read()
@ -1698,6 +1714,10 @@ class TestFileComparison(Base):
env = TestFileComparisonEnv
set_up = False
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def testIfMatch(self):
for file_item in self.env.files:
hdrs = {'If-Match': file_item.md5}
@ -1872,6 +1892,10 @@ class TestSlo(Base):
"Expected slo_enabled to be True/False, got %r" %
(self.env.slo_enabled,))
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def test_slo_get_simple_manifest(self):
file_item = self.env.container.file('manifest-abcde')
file_contents = file_item.read()
@ -2149,6 +2173,10 @@ class TestObjectVersioning(Base):
"Expected versioning_enabled to be True/False, got %r" %
(self.env.versioning_enabled,))
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def test_overwriting(self):
container = self.env.container
versions_container = self.env.versions_container
@ -2255,6 +2283,10 @@ class TestTempurl(Base):
self.obj_tempurl_parms = {'temp_url_sig': sig,
'temp_url_expires': str(expires)}
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def tempurl_sig(self, method, expires, path, key):
return hmac.new(
key,
@ -2433,6 +2465,10 @@ class TestSloTempurl(Base):
"Expected enabled to be True/False, got %r" %
(self.env.enabled,))
@classmethod
def tearDownClass(self):
self.env.account.delete_containers()
def tempurl_sig(self, method, expires, path, key):
return hmac.new(
key,