summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgholt <gholt@rackspace.com>2011-08-30 20:27:06 +0000
committergholt <gholt@rackspace.com>2011-08-30 20:27:06 +0000
commit5b9137cc716a45325253ad233e96a64f716ce554 (patch)
tree1f77df418227a812810d077302db0e7ca1b60acd
parentda3d53a1ef2941077a17334e3f0008b405cefcbf (diff)
downloadswift-5b9137cc716a45325253ad233e96a64f716ce554.tar.gz
Test for x-newest with new proxy and old object server
-rw-r--r--test/unit/proxy/test_server.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 14924f194..8a1888dab 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -182,6 +182,8 @@ def fake_http_connect(*code_iter, **kwargs):
self.etag or '"68b329da9893e34099c7d8ad5cb9c940"',
'x-works': 'yes',
}
+ if not self.timestamp:
+ del headers['x-timestamp']
try:
if container_ts_iter.next() is False:
headers['x-container-timestamp'] = '1'
@@ -1079,6 +1081,7 @@ class TestObjectController(unittest.TestCase):
test_status_map((200, 200, 200), 200, ('1', '3', '2'), '3')
test_status_map((200, 200, 200), 200, ('1', '3', '1'), '3')
test_status_map((200, 200, 200), 200, ('3', '3', '1'), '3')
+ test_status_map((200, 200, 200), 200, (None, None, None), None)
def test_GET_newest(self):
with save_globals():