← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ceilometer/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/revert-keystone-compat-2.patch

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-12-12 13:29:59 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20131212132959-8sojr8qzcmqz73z6
Tags: 2013.2.1-0ubuntu2
https://launchpad.net/bugs/1262788
* Resynchronize with stable/havana (fa5c8e2) (LP: #1262788):
  - [ec31468] change alarm_history.detail column type to Text LP: 1236861
  - [b616562] wsme 0.5b6 is broken LP: 1240741
  - [d90c8e1] Open stable/havana
  - [ef6c659] Ceilometer log contains DB password in plain text LP: 1244476
  - [7ad530b] Pin test-requirement for Nova to Havana
  - [d554fa8] import of rabbitMQ-specific config options regardless of
    configured RPC backend LP: 1244698
  - [99b21df] Havan rc2 acl scenarios failing due to timezone assumption
    LP: 1240994
  - [c5b7462] alarm creation with sqlalchemy fails with intermittent
    IntegrityError LP: 1255107
  - [ae82878] [Postgresql] ERROR in ceilometer-collector log after successful
    tempest run LP: 1237671
  - [5cbb965] [messaging] QPID broadcast RPC requests to all servers for a
    given topic LP: 1257293
  - [40b833c] On restart of QPID broker, fanout no longer works LP: 1251757
  - [fa5c8e2] Updated from global requirements
* debian/patches: Refreshed.
* debian/patches/revert-keystone-compat.patch: Revert additional
  keystoneclient 0.4.0 compat changes that were applied to stable/havana
  to fix upstream gate issues.
* debian/patches/revert-stable-havana-requirements.patch: Revert
  version bumps to dependencies in stable/havana back to what was
  shipped with Saucy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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': {