diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-15 22:50:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-15 22:50:43 +0000 |
| commit | bb1e383ae328517593ad4757cc168bf58d951111 (patch) | |
| tree | e6a5704ffe706df901b98eb209adcfcf201e8a61 /nova/tests | |
| parent | 6c3fd5ada0fb286af173ac65f20bf36049b0372f (diff) | |
| parent | 6a3e22a25c9ee3b259084df2f31c61b37f097e39 (diff) | |
Merge "fix timestamps to match documented ec2 api"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index 2b46be867..473e1d5f9 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -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') |