openstack/swift
Code Issues Proposed changes

Merge "Improve functional tests and test client"

Browse Source
This commit is contained in:
Jenkins 2016-09-30 15:06:49 +00:00 committed by Gerrit Code Review
commit 29516db36e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/swift_test_client.py
View File

@ -899,12 +899,10 @@ class File(Base):
fobj.close()
def sync_metadata(self, metadata=None, cfg=None, parms=None):
if metadata is None:
metadata = {}
if cfg is None:
cfg = {}
self.metadata.update(metadata)
self.metadata = self.metadata if metadata is None else metadata
if self.metadata:
headers = self.make_headers(cfg=cfg)

16
test/functional/tests.py
View File

@ -4188,7 +4188,7 @@ class TestObjectVersioning(Base):
prev_version.initialize()
self.assertEqual("bbbbb", prev_version.read())
self.assertEqual(prev_version.content_type, 'text/jibberish02')
self.assertIn('foo', prev_version.metadata)
self.assertNotIn('foo', prev_version.metadata)
self.assertIn('fu', prev_version.metadata)
# as we delete things, the old contents return
@ -4365,7 +4365,9 @@ class TestObjectVersioning(Base):
org_token = self.env.account.conn.storage_token
self.env.account.conn.storage_token = self.env.conn2.storage_token
try:
self.assertRaises(ResponseError, versioned_obj.delete)
with self.assertRaises(ResponseError) as cm:
versioned_obj.delete()
self.assertEqual(403, cm.exception.status)
finally:
self.env.account.conn.storage_token = org_token
@ -4472,7 +4474,7 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
prev_version.initialize()
self.assertEqual("bbbbb", prev_version.read())
self.assertEqual(prev_version.content_type, 'text/jibberish02')
self.assertIn('foo', prev_version.metadata)
self.assertNotIn('foo', prev_version.metadata)
self.assertIn('fu', prev_version.metadata)
# versioned_obj keeps the newest content
@ -4562,7 +4564,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
org_token = self.env.account.conn.storage_token
self.env.account.conn.storage_token = self.env.conn2.storage_token
try:
self.assertRaises(ResponseError, versioned_obj.delete)
with self.assertRaises(ResponseError) as cm:
versioned_obj.delete()
self.assertEqual(403, cm.exception.status)
finally:
self.env.account.conn.storage_token = org_token
@ -4570,7 +4574,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
self.assertEqual("bbbbb", versioned_obj.read())
versioned_obj.delete()
self.assertRaises(ResponseError, versioned_obj.read)
with self.assertRaises(ResponseError) as cm:
versioned_obj.read()
self.assertEqual(404, cm.exception.status)
# we have 3 objects in the versions_container, 'aaaaa', 'bbbbb'
# and delete-marker with empty content