summaryrefslogtreecommitdiff
path: root/nova/tests/api/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-20 07:19:39 +0000
committerGerrit Code Review <review@openstack.org>2012-02-20 07:19:39 +0000
commit757d8aa6f5e412aae08c2b1fb2d0c6f174d2f29c (patch)
tree58604d75f0a30360f38e855bbcd67772c5285cc7 /nova/tests/api/openstack
parent6f3751fcbd6a13902d33374d5ef884ad88748048 (diff)
parentc30193fbf5c0f2e77b09a44803246732c10e211d (diff)
downloadnova-757d8aa6f5e412aae08c2b1fb2d0c6f174d2f29c.tar.gz
Merge "Support non-UTC timestamps in changes-since filter"
Diffstat (limited to 'nova/tests/api/openstack')
-rw-r--r--nova/tests/api/openstack/compute/test_servers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 97add65b4e..c06fff32dc 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -21,6 +21,7 @@ import json
import urlparse
import uuid
+import iso8601
from lxml import etree
import webob
@@ -889,7 +890,8 @@ class ServersControllerTest(test.TestCase):
def fake_get_all(compute_self, context, search_opts=None):
self.assertNotEqual(search_opts, None)
self.assertTrue('changes-since' in search_opts)
- changes_since = datetime.datetime(2011, 1, 24, 17, 8, 1)
+ changes_since = datetime.datetime(2011, 1, 24, 17, 8, 1,
+ tzinfo=iso8601.iso8601.UTC)
self.assertEqual(search_opts['changes-since'], changes_since)
self.assertTrue('deleted' not in search_opts)
return [fakes.stub_instance(100, uuid=server_uuid)]