openstack/swift
Code Issues Proposed changes

Merge "Add 'Z' into isoformat for UTC time"

Browse Source
This commit is contained in:
Jenkins
2013-07-23 17:19:19 +00:00
committed by Gerrit Code Review
parent 1c9c4dcfab 7cd01a63d3
commit 7a2b0fb000
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/container/server.py
View File

@@ -420,6 +420,7 @@ class ContainerController(object):
# python isoformat() doesn't include msecs when zero # python isoformat() doesn't include msecs when zero
if len(created_at) < len("1970-01-01T00:00:00.000000"): if len(created_at) < len("1970-01-01T00:00:00.000000"):
created_at += ".000000" created_at += ".000000"
created_at += 'Z'
content_type, size = self.derive_content_type_metadata( content_type, size = self.derive_content_type_metadata(
content_type, size) content_type, size)
data.append({'last_modified': created_at, 'bytes': size, data.append({'last_modified': created_at, 'bytes': size,
@@ -434,6 +435,7 @@ class ContainerController(object):
# python isoformat() doesn't include msecs when zero # python isoformat() doesn't include msecs when zero
if len(created_at) < len("1970-01-01T00:00:00.000000"): if len(created_at) < len("1970-01-01T00:00:00.000000"):
created_at += ".000000" created_at += ".000000"
created_at += 'Z'
if content_type is None: if content_type is None:
xml_output.append( xml_output.append(
'<subdir name=%s><name>%s</name></subdir>' % '<subdir name=%s><name>%s</name></subdir>' %

20
test/unit/container/test_server.py
View File

@@ -738,17 +738,17 @@ class TestContainerController(unittest.TestCase):
"hash":"x", "hash":"x",
"bytes":0, "bytes":0,
"content_type":"text/plain", "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}, "last_modified":"1970-01-01T00:00:01.000000Z"},
{"name":"1", {"name":"1",
"hash":"x", "hash":"x",
"bytes":0, "bytes":0,
"content_type":"text/plain", "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}, "last_modified":"1970-01-01T00:00:01.000000Z"},
{"name":"2", {"name":"2",
"hash":"x", "hash":"x",
"bytes":0, "bytes":0,
"content_type":"text/plain", "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}] "last_modified":"1970-01-01T00:00:01.000000Z"}]
req = Request.blank('/sda1/p/a/jsonc?format=json', req = Request.blank('/sda1/p/a/jsonc?format=json',
environ={'REQUEST_METHOD': 'GET'}) environ={'REQUEST_METHOD': 'GET'})
@@ -860,12 +860,12 @@ class TestContainerController(unittest.TestCase):
"hash":"x", "hash":"x",
"bytes":0, "bytes":0,
"content_type":"text/plain", "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.500000"}, "last_modified":"1970-01-01T00:00:01.500000Z"},
{"name":"1", {"name":"1",
"hash":"x", "hash":"x",
"bytes":0, "bytes":0,
"content_type":"text/plain", "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}, ] "last_modified":"1970-01-01T00:00:01.000000Z"}, ]
req = Request.blank('/sda1/p/a/jsonc?format=json', req = Request.blank('/sda1/p/a/jsonc?format=json',
environ={'REQUEST_METHOD': 'GET'}) environ={'REQUEST_METHOD': 'GET'})
@@ -894,15 +894,15 @@ class TestContainerController(unittest.TestCase):
'<container name="xmlc">' \ '<container name="xmlc">' \
'<object><name>0</name><hash>x</hash><bytes>0</bytes>' \ '<object><name>0</name><hash>x</hash><bytes>0</bytes>' \
'<content_type>text/plain</content_type>' \ '<content_type>text/plain</content_type>' \
'<last_modified>1970-01-01T00:00:01.000000' \ '<last_modified>1970-01-01T00:00:01.000000Z' \
'</last_modified></object>' \ '</last_modified></object>' \
'<object><name>1</name><hash>x</hash><bytes>0</bytes>' \ '<object><name>1</name><hash>x</hash><bytes>0</bytes>' \
'<content_type>text/plain</content_type>' \ '<content_type>text/plain</content_type>' \
'<last_modified>1970-01-01T00:00:01.000000' \ '<last_modified>1970-01-01T00:00:01.000000Z' \
'</last_modified></object>' \ '</last_modified></object>' \
'<object><name>2</name><hash>x</hash><bytes>0</bytes>' \ '<object><name>2</name><hash>x</hash><bytes>0</bytes>' \
'<content_type>text/plain</content_type>' \ '<content_type>text/plain</content_type>' \
'<last_modified>1970-01-01T00:00:01.000000' \ '<last_modified>1970-01-01T00:00:01.000000Z' \
'</last_modified></object>' \ '</last_modified></object>' \
'</container>' '</container>'
# tests # tests
@@ -1113,9 +1113,9 @@ class TestContainerController(unittest.TestCase):
resp = self.controller.GET(req) resp = self.controller.GET(req)
self.assertEquals(simplejson.loads(resp.body), self.assertEquals(simplejson.loads(resp.body),
[{"name":"US/OK", "hash":"x", "bytes":0, "content_type":"text/plain", [{"name":"US/OK", "hash":"x", "bytes":0, "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}, "last_modified":"1970-01-01T00:00:01.000000Z"},
{"name":"US/TX", "hash":"x", "bytes":0, "content_type":"text/plain", {"name":"US/TX", "hash":"x", "bytes":0, "content_type":"text/plain",
"last_modified":"1970-01-01T00:00:01.000000"}]) "last_modified":"1970-01-01T00:00:01.000000Z"}])
def test_GET_insufficient_storage(self): def test_GET_insufficient_storage(self):
self.controller = container_server.ContainerController( self.controller = container_server.ContainerController(