Merge "functests: Clean up objects better"
This commit is contained in:
commit
9dffe8b88d
@ -68,9 +68,9 @@ class TestContainer(unittest2.TestCase):
|
||||
return check_response(conn)
|
||||
|
||||
def delete(url, token, parsed, conn, container, obj):
|
||||
conn.request(
|
||||
'DELETE', '/'.join([parsed.path, container, obj['name']]), '',
|
||||
{'X-Auth-Token': token})
|
||||
path = '/'.join([parsed.path, container,
|
||||
obj['name'].encode('utf8')])
|
||||
conn.request('DELETE', path, '', {'X-Auth-Token': token})
|
||||
return check_response(conn)
|
||||
|
||||
for container in (self.name, self.container):
|
||||
|
@ -104,9 +104,9 @@ class TestObject(unittest2.TestCase):
|
||||
|
||||
# delete an object
|
||||
def delete(url, token, parsed, conn, container, obj):
|
||||
conn.request(
|
||||
'DELETE', '/'.join([parsed.path, container, obj['name']]), '',
|
||||
{'X-Auth-Token': token})
|
||||
path = '/'.join([parsed.path, container,
|
||||
obj['name'].encode('utf8')])
|
||||
conn.request('DELETE', path, '', {'X-Auth-Token': token})
|
||||
return check_response(conn)
|
||||
|
||||
for container in self.containers:
|
||||
|
Loading…
x
Reference in New Issue
Block a user