Code Review
/
openstack-build
/
ceilometer-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added template for package's test script
[openstack-build/ceilometer-build.git]
/
debian
/
patches
/
revert-keystone-compat.patch
diff --git
a/debian/patches/revert-keystone-compat.patch
b/debian/patches/revert-keystone-compat.patch
index 409706c53f1c932e04213f53bd8c4d320b7c4ad7..44210ce5255932dfc1f3b98c69c68bdd92cbef09 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:
+
+ def get(self, key):
if key == "tokens/%s" % VALID_TOKEN:
- dt =
timeutils.utc
now() + datetime.timedelta(minutes=5)
+ dt =
datetime.datetime.
now() + datetime.timedelta(minutes=5)
return json.dumps(({'access': {
@@ -52,7 +55,7 @@ class FakeMemcache(object):
'roles': [
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:
- }}, timeutils.isotime(dt)))
+ }}, dt.strftime("%s")))
if key == "tokens/%s" % VALID_TOKEN2:
- dt =
timeutils.utc
now() + datetime.timedelta(minutes=5)
+ dt =
datetime.datetime.
now() + datetime.timedelta(minutes=5)
return json.dumps(({'access': {
@@ -65,11 +68,11 @@ class FakeMemcache(object):
'roles': [
return json.dumps(({'access': {
@@ -65,11 +68,11 @@ class FakeMemcache(object):
'roles': [