Fix patch

Change-Id: I49d202f8b1ee2f055bf3e6f2c0b62b5fc5757659

diff --git a/debian/patches/revert-keystone-compat.patch b/debian/patches/revert-keystone-compat.patch
index 44210ce5255932dfc1f3b98c69c68bdd92cbef09..409706c53f1c932e04213f53bd8c4d320b7c4ad7 100644 (file)
--- a/debian/patches/revert-keystone-compat.patch
+++ b/debian/patches/revert-keystone-compat.patch
@@ -53,7 +53,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921
 +
 +    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):
                      'roles': [
@@ -62,7 +62,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921
 -            }}, 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):
                      'roles': [

diff --git a/debian/patches/series b/debian/patches/series
index 06400c22e4bdfb862fd623d76000e23c18718f22..df1b4141cc20c8c3cff49c25f841f51bc0de4288 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 default-dbconnection-sqlite.patch
 skip-database-tests.patch
 fix-setup-requirements.patch
-revert-keystone-compat.patch
+#revert-keystone-compat.patch