From eb707547f577f2730f4eca37b34385a1db68b494 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Thu, 1 Sep 2011 15:48:53 +0000 Subject: [PATCH 1/3] Fixed date format for S3 bucket listing --- swift/common/middleware/swift3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py index aab8dde0d8..8d67655c59 100644 --- a/swift/common/middleware/swift3.py +++ b/swift/common/middleware/swift3.py @@ -267,7 +267,7 @@ class BucketController(Controller): 'true' if len(objects) == (max_keys + 1) else 'false', max_keys, xml_escape(self.container_name), - "".join(['%s%s%s%sZ%s%sSTA'\ 'NDARD' % (xml_escape(i['name']), i['last_modified'], i['hash'], From 2be5c2a820453860986e8e127e1bf18d9b75587c Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Thu, 1 Sep 2011 21:12:35 +0000 Subject: [PATCH 2/3] Added unit test :P --- test/unit/common/middleware/test_swift3.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/unit/common/middleware/test_swift3.py b/test/unit/common/middleware/test_swift3.py index 2579cce83d..78d5e33333 100644 --- a/test/unit/common/middleware/test_swift3.py +++ b/test/unit/common/middleware/test_swift3.py @@ -17,6 +17,7 @@ import unittest from datetime import datetime import cgi import hashlib +import rfc822 from webob import Request, Response from webob.exc import HTTPUnauthorized, HTTPCreated, HTTPNoContent,\ @@ -286,6 +287,9 @@ class TestSwift3(unittest.TestCase): for o in objects: if o.childNodes[0].nodeName == 'Key': names.append(o.childNodes[0].childNodes[0].nodeValue) + if o.childNodes[1].nodeName == 'LastModified': + self.assertTrue( + o.childNodes[1].childNodes[0].nodeValue.endswith('Z')) self.assertEquals(len(names), len(FakeAppBucket().objects)) for i in FakeAppBucket().objects: From 71f82582dbaaaa65312f7baf15277e9254ef6bd9 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Fri, 2 Sep 2011 15:17:35 +0000 Subject: [PATCH 3/3] removed unused import --- test/unit/common/middleware/test_swift3.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unit/common/middleware/test_swift3.py b/test/unit/common/middleware/test_swift3.py index 78d5e33333..da49413310 100644 --- a/test/unit/common/middleware/test_swift3.py +++ b/test/unit/common/middleware/test_swift3.py @@ -17,7 +17,6 @@ import unittest from datetime import datetime import cgi import hashlib -import rfc822 from webob import Request, Response from webob.exc import HTTPUnauthorized, HTTPCreated, HTTPNoContent,\