x/swiftonhpss
Code Issues Proposed changes

Enable version manifest unit test

Browse Source 
The version manifest unit test needed to be adjusted
for gluster-swift.  Gluster-swift does not support a PUT
of an object "a" then another object "a/b".  The first object
"a" would be interpreted as a file, while "a/b" would
require "a" to now be a directory.

Change-Id: I1628d5575d1b68ccce20386a4a0a0b2442d631af
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5987
Reviewed-by: Chetan Risbud <crisbud@redhat.com>
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
This commit is contained in:
Luis Pabon 2013-09-22 21:45:58 -04:00 committed by Peter Portante
parent 33f3e0b6d1
commit 3a7081a4db
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/unit/proxy/test_server.py
View File

@ -3348,7 +3348,6 @@ class TestObjectController(unittest.TestCase):
self.assertEquals(body, 'oh hai123456789abcdef') self.assertEquals(body, 'oh hai123456789abcdef')
def test_version_manifest(self): def test_version_manifest(self):
raise SkipTest("Not until we support versioned objects")
versions_to_create = 3 versions_to_create = 3
# Create a container for our versioned object testing # Create a container for our versioned object testing
(prolis, acc1lis, acc2lis, con1lis, con2lis, obj1lis, (prolis, acc1lis, acc2lis, con1lis, con2lis, obj1lis,
@ -3562,30 +3561,19 @@ class TestObjectController(unittest.TestCase):
exp = 'HTTP/1.1 204 No Content' exp = 'HTTP/1.1 204 No Content'
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
# DELETE v1/a/c/obj shouldn't delete v1/a/c/obj/sub versions # DELETE v1/a/c/dir shouldn't delete v1/a/c/dir/sub versions
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: ' fd.write('PUT /v1/a/versions/dir HTTP/1.1\r\nHost: '
'localhost\r\nConnection: close\r\nX-Storage-Token: ' 'localhost\r\nConnection: close\r\nX-Storage-Token: '
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish0\r\n' 't\r\nContent-Length: 0\r\nContent-Type: application/directory\r\n\r\n')
'Foo: barbaz\r\n\r\n00000\r\n')
fd.flush() fd.flush()
headers = readuntil2crlfs(fd) headers = readuntil2crlfs(fd)
exp = 'HTTP/1.1 201' exp = 'HTTP/1.1 201'
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: ' fd.write('PUT /v1/a/versions/dir/sub HTTP/1.1\r\nHost: '
'localhost\r\nConnection: close\r\nX-Storage-Token: '
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish0\r\n'
'Foo: barbaz\r\n\r\n00001\r\n')
fd.flush()
headers = readuntil2crlfs(fd)
exp = 'HTTP/1.1 201'
self.assertEquals(headers[:len(exp)], exp)
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile()
fd.write('PUT /v1/a/versions/name/sub HTTP/1.1\r\nHost: '
'localhost\r\nConnection: close\r\nX-Storage-Token: ' 'localhost\r\nConnection: close\r\nX-Storage-Token: '
't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n' 't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n'
'Foo: barbaz\r\n\r\nsub1\r\n') 'Foo: barbaz\r\n\r\nsub1\r\n')
@ -3595,7 +3583,7 @@ class TestObjectController(unittest.TestCase):
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('PUT /v1/a/versions/name/sub HTTP/1.1\r\nHost: ' fd.write('PUT /v1/a/versions/dir/sub HTTP/1.1\r\nHost: '
'localhost\r\nConnection: close\r\nX-Storage-Token: ' 'localhost\r\nConnection: close\r\nX-Storage-Token: '
't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n' 't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n'
'Foo: barbaz\r\n\r\nsub2\r\n') 'Foo: barbaz\r\n\r\nsub2\r\n')
@ -3605,7 +3593,7 @@ class TestObjectController(unittest.TestCase):
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('DELETE /v1/a/versions/name HTTP/1.1\r\nHost: localhost\r\n' fd.write('DELETE /v1/a/versions/dir HTTP/1.1\r\nHost: localhost\r\n'
'Connection: close\r\nX-Storage-Token: t\r\n\r\n') 'Connection: close\r\nX-Storage-Token: t\r\n\r\n')
fd.flush() fd.flush()
headers = readuntil2crlfs(fd) headers = readuntil2crlfs(fd)
@ -3613,7 +3601,7 @@ class TestObjectController(unittest.TestCase):
self.assertEquals(headers[:len(exp)], exp) self.assertEquals(headers[:len(exp)], exp)
sock = connect_tcp(('localhost', prolis.getsockname()[1])) sock = connect_tcp(('localhost', prolis.getsockname()[1]))
fd = sock.makefile() fd = sock.makefile()
fd.write('GET /v1/a/vers?prefix=008name/sub/ HTTP/1.1\r\nHost: ' fd.write('GET /v1/a/vers?prefix=007dir/sub/ HTTP/1.1\r\nHost: '
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n') 'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
fd.flush() fd.flush()
headers = readuntil2crlfs(fd) headers = readuntil2crlfs(fd)