Merge lp:~cthier/swift/s3_bucket_date into lp:~hudson-openstack/swift/trunk

[Chuck Thier]

Fixes last modified date for swift3 middleware

[John Dickinson (notmyname)]

no test?

[lp:~cthier/swift/s3_bucket_date]

354. By Chuck Thier on 2011-09-01

Added unit test :P

355. By Chuck Thier on 2011-09-02

removed unused import

[gholt (gholt)]

review: Approve

[David Goetz (david-goetz)]

looks good

review: Approve

=== modified file 'swift/common/middleware/swift3.py'
--- swift/common/middleware/swift3.py	2011-07-27 09:21:34 +0000
+++ swift/common/middleware/swift3.py	2011-09-02 15:18:24 +0000
@@ -267,7 +267,7 @@
                 'true' if len(objects) == (max_keys + 1) else 'false',
                 max_keys,
                 xml_escape(self.container_name),
-                "".join(['<Contents><Key>%s</Key><LastModified>%s</LastModif'\
+                "".join(['<Contents><Key>%s</Key><LastModified>%sZ</LastModif'\
                         'ied><ETag>%s</ETag><Size>%s</Size><StorageClass>STA'\
                         'NDARD</StorageClass></Contents>' %
                         (xml_escape(i['name']), i['last_modified'], i['hash'],

=== modified file 'test/unit/common/middleware/test_swift3.py'
--- test/unit/common/middleware/test_swift3.py	2011-07-11 11:19:43 +0000
+++ test/unit/common/middleware/test_swift3.py	2011-09-02 15:18:24 +0000
@@ -286,6 +286,9 @@
         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: