debian/patches/revert-keystone-compat-2.patch

   1 From: Adam Gandelman <adamg@canonical.com>
   2 Date: Thu, 12 Dec 2013 13:25:30 -0800
   3
   4 This reverts commit becae1827530c0cb43cd57180f853b364ec1dcbd,
   5 which was applied to allow upstream gates to pass with newer
   6 versions of python-keystoneclient.  This causes failures on
   7 Ubuntu which uses a stable, older version of python-keystoneclient.
   8
   9 ---
  10  tests/api/v2/test_acl_scenarios.py | 4 ++--
  11  1 file changed, 2 insertions(+), 2 deletions(-)
  12
  13 Index: ceilometer/tests/api/v2/test_acl_scenarios.py
  14 ===================================================================
  15 --- ceilometer.orig/tests/api/v2/test_acl_scenarios.py  2013-12-12 13:29:17.367189074 -0800
  16 +++ ceilometer/tests/api/v2/test_acl_scenarios.py       2013-12-12 13:29:17.359189074 -0800
  17 @@ -44,7 +44,7 @@
  18
  19      def get(self, key):
  20          if key == "tokens/%s" % VALID_TOKEN:
  21 -            dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
  22 +            dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
  23              return json.dumps(({'access': {
  24                  'token': {'id': VALID_TOKEN},
  25                  'user': {
  26 @@ -57,7 +57,7 @@
  27                      ]},
  28              }}, dt.strftime("%s")))
  29          if key == "tokens/%s" % VALID_TOKEN2:
  30 -            dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
  31 +            dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
  32              return json.dumps(({'access': {
  33                  'token': {'id': VALID_TOKEN2},
  34                  'user': {