summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2013-05-24 11:35:59 -0400
committerLuis Pabon <lpabon@redhat.com>2013-06-04 11:27:02 -0700
commit3435c59ba3a679867adffa84719b8648c9fbf601 (patch)
treeb13dcacc4a2b6eb6fe013b9fe88cb30cbead21af /test
parent40c313378e5fffb846f1fd143573a687e2774b28 (diff)
Forward port PDQ 3489: turn off cont & act updates
This is a simple sub-classing of the proper update methods to just no-op their behavior. Change-Id: Ib1ae5234d372cbce572da34cfe702235b78f2310 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/5088 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/unit/proxy/test_server.py49
1 files changed, 48 insertions, 1 deletions
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 4e288d6..a04380d 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -40,7 +40,7 @@ gfs.RUN_DIR = mkdtemp()
from test.unit import connect_tcp, readuntil2crlfs, FakeLogger, fake_http_connect
from gluster.swift.proxy.server import server as proxy_server
-from gluster.swift.obj.server import server as object_server
+from gluster.swift.obj import server as object_server
from gluster.swift.account import server as account_server
from gluster.swift.container import server as container_server
from swift.common import ring
@@ -2782,6 +2782,53 @@ class TestObjectController(unittest.TestCase):
body = fd.read()
self.assertEquals(body, 'oh hai123456789abcdef')
+ def test_put_put(self):
+ (prolis, acc1lis, acc2lis, con1lis, con2lis, obj1lis,
+ obj2lis) = _test_sockets
+ sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+ fd = sock.makefile()
+ fd.write('PUT /v1/a/c/o/putput HTTP/1.1\r\nHost: localhost\r\n'
+ 'Connection: close\r\nX-Auth-Token: t\r\n'
+ 'Content-Length:27\r\n\r\n'
+ 'abcdefghijklmnopqrstuvwxyz\n\r\n\r\n')
+ fd.flush()
+ headers = readuntil2crlfs(fd)
+ exp = 'HTTP/1.1 201'
+ self.assertEquals(headers[:len(exp)], exp)
+ # Ensure we get what we put
+ sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+ fd = sock.makefile()
+ fd.write('GET /v1/a/c/o/putput HTTP/1.1\r\nHost: localhost\r\n'
+ 'Connection: close\r\nX-Auth-Token: t\r\n\r\n')
+ fd.flush()
+ headers = readuntil2crlfs(fd)
+ exp = 'HTTP/1.1 200'
+ self.assertEquals(headers[:len(exp)], exp)
+ body = fd.read()
+ self.assertEquals(body, 'abcdefghijklmnopqrstuvwxyz\n')
+
+ sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+ fd = sock.makefile()
+ fd.write('PUT /v1/a/c/o/putput HTTP/1.1\r\nHost: localhost\r\n'
+ 'Connection: close\r\nX-Auth-Token: t\r\n'
+ 'Content-Length:27\r\n\r\n'
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZ\n\r\n\r\n')
+ fd.flush()
+ headers = readuntil2crlfs(fd)
+ exp = 'HTTP/1.1 201'
+ self.assertEquals(headers[:len(exp)], exp)
+ # Ensure we get what we put
+ sock = connect_tcp(('localhost', prolis.getsockname()[1]))
+ fd = sock.makefile()
+ fd.write('GET /v1/a/c/o/putput HTTP/1.1\r\nHost: localhost\r\n'
+ 'Connection: close\r\nX-Auth-Token: t\r\n\r\n')
+ fd.flush()
+ headers = readuntil2crlfs(fd)
+ exp = 'HTTP/1.1 200'
+ self.assertEquals(headers[:len(exp)], exp)
+ body = fd.read()
+ self.assertEquals(body, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ\n')
+
def test_version_manifest(self):
raise SkipTest("Not until we support versioned objects")
versions_to_create = 3