From: Dmitry Burmistrov <dburmistrov@mirantis.com>
Date: Tue, 3 Dec 2013 14:36:12 +0000 (+0400)
Subject: Fix patch
X-Git-Tag: 2014.1~9
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=762093fa94a446983233f437f759fcffda5cf299;p=openstack-build%2Fceilometer-build.git

Fix patch
Change-Id: I49d202f8b1ee2f055bf3e6f2c0b62b5fc5757659
---

diff --git a/debian/patches/revert-keystone-compat.patch b/debian/patches/revert-keystone-compat.patch
index 44210ce..409706c 100644
--- 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 06400c2..df1b414 100644
--- 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