From: Adam Gandelman <adamg@canonical.com>
Date: Thu, 12 Dec 2013 13:25:30 -0800

This reverts commit becae1827530c0cb43cd57180f853b364ec1dcbd,
which was applied to allow upstream gates to pass with newer
versions of python-keystoneclient.  This causes failures on
Ubuntu which uses a stable, older version of python-keystoneclient.

---
 tests/api/v2/test_acl_scenarios.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: ceilometer/tests/api/v2/test_acl_scenarios.py
===================================================================
--- ceilometer.orig/tests/api/v2/test_acl_scenarios.py	2013-12-12 13:29:17.367189074 -0800
+++ ceilometer/tests/api/v2/test_acl_scenarios.py	2013-12-12 13:29:17.359189074 -0800
@@ -44,7 +44,7 @@
 
     def get(self, key):
         if key == "tokens/%s" % VALID_TOKEN:
-            dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
+            dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
             return json.dumps(({'access': {
                 'token': {'id': VALID_TOKEN},
                 'user': {
@@ -57,7 +57,7 @@
                     ]},
             }}, dt.strftime("%s")))
         if key == "tokens/%s" % VALID_TOKEN2:
-            dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
+            dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
             return json.dumps(({'access': {
                 'token': {'id': VALID_TOKEN2},
                 'user': {