X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Frevert-keystone-compat.patch;h=a0ec1306c259b2ee4ef709c08a0d8ea2eb6cd44c;hb=eb6e32f99a917ab60d24d00019cef8d4433a31e6;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..a0ec130 100644
--- a/debian/patches/revert-keystone-compat.patch
+++ b/debian/patches/revert-keystone-compat.patch
@@ -3,9 +3,11 @@ Author: James Page <james.page@ubuntu.com>
 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>
  
@@ -16,7 +18,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921
  # 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>
  
@@ -30,9 +32,11 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921
  # 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
@@ -40,7 +44,7 @@ Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb60921
  
  from .base import FunctionalTest
  
-@@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832'
+@@ -38,8 +37,12 @@
  
  
  class FakeMemcache(object):
@@ -53,18 +57,18 @@ 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):
+@@ -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'},
                      ]},