Bug: https://bugs.launchpad.net/ceilometer/+bug/1239651
Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb609216a07111067478f3755cceb4
---- a/etc/ceilometer/ceilometer.conf.sample
-+++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -742,10 +742,6 @@ connection=sqlite:////var/lib/ceilometer
+Index: ceilometer/etc/ceilometer/ceilometer.conf.sample
+===================================================================
+--- ceilometer.orig/etc/ceilometer/ceilometer.conf.sample 2013-12-12 13:11:29.243179330 -0800
++++ ceilometer/etc/ceilometer/ceilometer.conf.sample 2013-12-12 13:11:29.239179330 -0800
+@@ -742,10 +742,6 @@
# server. (boolean value)
#http_connect_timeout=<None>
# Allows to pass in the name of a fake http_handler callback
# function used instead of httplib.HTTPConnection or
# httplib.HTTPSConnection. Useful for unit testing where
-@@ -778,13 +774,6 @@ connection=sqlite:////var/lib/ceilometer
+@@ -778,13 +774,6 @@
# (string value)
#keyfile=<None>
# Directory used to cache files related to PKI tokens (string
# value)
#signing_dir=<None>
---- a/tests/api/v2/test_acl_scenarios.py
-+++ b/tests/api/v2/test_acl_scenarios.py
-@@ -27,7 +27,6 @@ from ceilometer import sample
+Index: ceilometer/tests/api/v2/test_acl_scenarios.py
+===================================================================
+--- ceilometer.orig/tests/api/v2/test_acl_scenarios.py 2013-12-12 13:11:29.243179330 -0800
++++ ceilometer/tests/api/v2/test_acl_scenarios.py 2013-12-12 13:11:29.239179330 -0800
+@@ -27,7 +27,6 @@
from ceilometer.api import acl
from ceilometer.publisher import rpc
from ceilometer.tests import db as tests_db
from .base import FunctionalTest
-@@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832'
+@@ -38,8 +37,12 @@
class FakeMemcache(object):
+
+ def get(self, key):
if key == "tokens/%s" % VALID_TOKEN:
- dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
+ dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
return json.dumps(({'access': {
-@@ -52,7 +55,7 @@ class FakeMemcache(object):
+@@ -52,7 +55,7 @@
'roles': [
{'name': 'admin'},
]},
- }}, timeutils.isotime(dt)))
+ }}, dt.strftime("%s")))
if key == "tokens/%s" % VALID_TOKEN2:
- dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
+ dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
return json.dumps(({'access': {
-@@ -65,11 +68,11 @@ class FakeMemcache(object):
+@@ -65,11 +68,11 @@
'roles': [
{'name': 'Member'},
]},