OpenStack Object Storage (swift)

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

  1. s3_bucket_date
  2. Merge into trunk
Proposed by Chuck Thier
Status: Merged
Approved by: gholt
Approved revision: 355
Merged at revision: 354
Proposed branch: lp:~cthier/swift/s3_bucket_date
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 26 lines (+4/-1)
2 files modified
swift/common/middleware/swift3.py (+1/-1)
test/unit/common/middleware/test_swift3.py (+3/-0)
To merge this branch: bzr merge lp:~cthier/swift/s3_bucket_date
Reviewer Review Type Date Requested Status
David Goetz (community) Approve
gholt (community) Approve
Review via email: mp+73685@code.launchpad.net

Description of the change

Fixes last modified date for swift3 middleware

To post a comment you must log in.
Revision history for this message
John Dickinson (notmyname) wrote :

no test?

lp:~cthier/swift/s3_bucket_date updated
354. By Chuck Thier

Added unit test :P

355. By Chuck Thier

removed unused import

Revision history for this message
gholt (gholt) :
review: Approve
Revision history for this message
David Goetz (david-goetz) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
267 'true' if len(objects) == (max_keys + 1) else 'false',267 'true' if len(objects) == (max_keys + 1) else 'false',
268 max_keys,268 max_keys,
269 xml_escape(self.container_name),269 xml_escape(self.container_name),
270 "".join(['<Contents><Key>%s</Key><LastModified>%s</LastModif'\270 "".join(['<Contents><Key>%s</Key><LastModified>%sZ</LastModif'\
271 'ied><ETag>%s</ETag><Size>%s</Size><StorageClass>STA'\271 'ied><ETag>%s</ETag><Size>%s</Size><StorageClass>STA'\
272 'NDARD</StorageClass></Contents>' %272 'NDARD</StorageClass></Contents>' %
273 (xml_escape(i['name']), i['last_modified'], i['hash'],273 (xml_escape(i['name']), i['last_modified'], i['hash'],
274274
=== 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 @@
286 for o in objects:286 for o in objects:
287 if o.childNodes[0].nodeName == 'Key':287 if o.childNodes[0].nodeName == 'Key':
288 names.append(o.childNodes[0].childNodes[0].nodeValue)288 names.append(o.childNodes[0].childNodes[0].nodeValue)
289 if o.childNodes[1].nodeName == 'LastModified':
290 self.assertTrue(
291 o.childNodes[1].childNodes[0].nodeValue.endswith('Z'))
289292
290 self.assertEquals(len(names), len(FakeAppBucket().objects))293 self.assertEquals(len(names), len(FakeAppBucket().objects))
291 for i in FakeAppBucket().objects:294 for i in FakeAppBucket().objects: