X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Frevert-keystone-compat.patch;h=409706c53f1c932e04213f53bd8c4d320b7c4ad7;hb=00988157a804c6b1d310b088d553461bb38c6c14;hp=44210ce5255932dfc1f3b98c69c68bdd92cbef09;hpb=e1a973dc6c81cef2cc8f44ffe4784c6007d686f1;p=openstack-build%2Fceilometer-build.git 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': [