Merge "fix timestamps to match documented ec2 api"
This commit is contained in:
commit
bb1e383ae3
1
Authors
1
Authors
|
@ -119,6 +119,7 @@ Loganathan Parthipan <parthipan@hp.com>
|
|||
Lorin Hochstein <lorin@nimbisservices.com>
|
||||
Lvov Maxim <usrleon@gmail.com>
|
||||
Mandell Degerness <mdegerne@gmail.com>
|
||||
Mark McClain <mark.mcclain@dreamhost.com>
|
||||
Mark McLoughlin <markmc@redhat.com>
|
||||
Mark Washenberger <mark.washenberger@rackspace.com>
|
||||
Maru Newby <mnewby@internap.com>
|
||||
|
|
|
@ -44,7 +44,7 @@ def _underscore_to_xmlcase(str):
|
|||
|
||||
def _database_to_isoformat(datetimeobj):
|
||||
"""Return a xs:dateTime parsable string from datatime"""
|
||||
return datetimeobj.strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
return datetimeobj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + 'Z'
|
||||
|
||||
|
||||
class APIRequest(object):
|
||||
|
|
|
@ -242,14 +242,14 @@ class ApiEc2TestCase(test.TestCase):
|
|||
"%Y-%m-%d %H:%M:%S.%f")
|
||||
self.assertEqual(
|
||||
conv(time_to_convert),
|
||||
'2011-02-21T20:14:10Z')
|
||||
'2011-02-21T20:14:10.634Z')
|
||||
# mysqlite database representation
|
||||
time_to_convert = datetime.datetime.strptime(
|
||||
"2011-02-21 19:56:18",
|
||||
"%Y-%m-%d %H:%M:%S")
|
||||
self.assertEqual(
|
||||
conv(time_to_convert),
|
||||
'2011-02-21T19:56:18Z')
|
||||
'2011-02-21T19:56:18.000Z')
|
||||
|
||||
def test_xmlns_version_matches_request_version(self):
|
||||
self.expect_http(api_version='2010-10-30')
|
||||
|
|
Loading…
Reference in New Issue