summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2013-11-15 12:30:51 +0530
committerLuis Pabon <lpabon@redhat.com>2013-12-05 14:13:45 -0800
commit702610592f86fa9f93a311747be67f8d71ad5ab2 (patch)
tree929de8149ed25f539a03a8374d7dae0fa78826bd
parent2d818c06b805b051996d605ef8ef5b5415bd6293 (diff)
Fix unit-tests failing in master branch
Unit tests failed as upstream swift was updated with this commit: f0c0855ec8207fa8be63ed4f3135c8e29a31acc0 Updated gluster-swift unit tests accordingly. Change-Id: I286c807a17d79c2d9a21ee436f029a0f59cb9b7b Signed-off-by: Prashanth Pai <ppai@redhat.com> Reviewed-on: http://review.gluster.org/6268 Reviewed-by: Peter Portante <pportant@redhat.com> Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
-rw-r--r--test/unit/proxy/test_server.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 4467b12..4537ab6 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -2922,7 +2922,7 @@ class TestObjectController(unittest.TestCase):
req = Request.blank('/a/c/o', environ={'REQUEST_METHOD': 'COPY'},
headers={'Destination': 'c/o'})
req.account = 'a'
- set_http_connect(200, 200, 200, 200, 200, 200, 200, 201, 201, 201)
+ set_http_connect(200, 200, 200, 200, 200, 201, 201, 201, 200, 200)
# acct cont acct cont objc objc objc obj obj obj
self.app.memcache.store = {}
resp = controller.COPY(req)
@@ -2934,7 +2934,7 @@ class TestObjectController(unittest.TestCase):
headers={'Destination': 'c/o'})
req.account = 'a'
controller.object_name = 'o/o2'
- set_http_connect(200, 200, 200, 200, 200, 200, 200, 201, 201, 201)
+ set_http_connect(200, 200, 200, 200, 200, 201, 201, 201, 200, 200)
# acct cont acct cont objc objc objc obj obj obj
self.app.memcache.store = {}
resp = controller.COPY(req)
@@ -2945,7 +2945,7 @@ class TestObjectController(unittest.TestCase):
headers={'Destination': '/c/o'})
req.account = 'a'
controller.object_name = 'o'
- set_http_connect(200, 200, 200, 200, 200, 200, 200, 201, 201, 201)
+ set_http_connect(200, 200, 200, 200, 200, 201, 201, 201, 200, 200)
# acct cont acct cont objc objc objc obj obj obj
self.app.memcache.store = {}
resp = controller.COPY(req)
@@ -2957,7 +2957,7 @@ class TestObjectController(unittest.TestCase):
headers={'Destination': '/c/o'})
req.account = 'a'
controller.object_name = 'o/o2'
- set_http_connect(200, 200, 200, 200, 200, 200, 200, 201, 201, 201)
+ set_http_connect(200, 200, 200, 200, 200, 201, 201, 201, 200, 200)
# acct cont acct cont objc objc objc obj obj obj
self.app.memcache.store = {}
resp = controller.COPY(req)
@@ -5178,7 +5178,7 @@ class TestContainerController(unittest.TestCase):
controller = proxy_server.ContainerController(self.app, 'account',
'container')
self.assert_status_map(controller.PUT,
- (200, 200, 200, 201, 201, 201), 201,
+ (200, 201, 201, 201), 201,
missing_container=True)
self.app.max_containers_per_account = 12345
@@ -5192,7 +5192,7 @@ class TestContainerController(unittest.TestCase):
controller = proxy_server.ContainerController(self.app, 'account',
'container')
self.assert_status_map(controller.PUT,
- (200, 200, 200, 201, 201, 201), 201,
+ (200, 201, 201, 201), 201,
missing_container=True)
def test_PUT_max_container_name_length(self):
@@ -5201,7 +5201,7 @@ class TestContainerController(unittest.TestCase):
controller = proxy_server.ContainerController(self.app, 'account',
'1' * limit)
self.assert_status_map(controller.PUT,
- (200, 200, 200, 201, 201, 201), 201,
+ (200, 201, 201, 201), 201,
missing_container=True)
controller = proxy_server.ContainerController(self.app, 'account',
'2' * (limit + 1))
@@ -5286,7 +5286,7 @@ class TestContainerController(unittest.TestCase):
controller = proxy_server.ContainerController(self.app, 'account',
'container')
self.app.memcache = MockMemcache(allow_lock=True)
- set_http_connect(200, 200, 200, 201, 201, 201,
+ set_http_connect(200, 201, 201, 201,
missing_container=True)
req = Request.blank('/a/c', environ={'REQUEST_METHOD': 'PUT'})
self.app.update_request(req)