Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integration

Conflicts:
	keystoneclient/exceptions.py
	keystoneclient/fixture/discovery.py
	keystoneclient/fixture/v2.py
	keystoneclient/fixture/v3.py
	keystoneclient/middleware/auth_token.py
	keystoneclient/middleware/s3_token.py
	keystoneclient/tests/unit/test_auth_token_middleware.py
	keystoneclient/tests/unit/test_memcache_crypt.py
	keystoneclient/tests/unit/test_s3_token_middleware.py
	requirements.txt
	test-requirements.txt

Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5

1 files changed, 4 insertions, 5 deletions

diff --git a/keystoneclient/tests/unit/utils.py b/keystoneclient/tests/unit/utils.py
index 2274519..7c6de95 100644
--- a/keystoneclient/tests/unit/utils.py
+++ b/keystoneclient/tests/unit/utils.py
@@ -12,18 +12,18 @@
 
 import logging
 import sys
-import time
 import uuid
 
 import fixtures
 from oslo_serialization import jsonutils
-from oslotest import mockpatch
 import requests
 from requests_mock.contrib import fixture
 import six
 from six.moves.urllib import parse as urlparse
 import testtools
 
+from keystoneclient.tests.unit import client_fixtures
+
 
 class TestCase(testtools.TestCase):
 
@@ -42,10 +42,9 @@ class TestCase(testtools.TestCase):
 
     def setUp(self):
         super(TestCase, self).setUp()
-        self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
-        self.time_patcher = self.useFixture(
-            mockpatch.PatchObject(time, 'time', lambda: 1234)).mock
+        self.deprecations = self.useFixture(client_fixtures.Deprecations())
 
+        self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
         self.requests_mock = self.useFixture(fixture.Fixture())
 
     def stub_url(self, method, parts=None, base_url=None, json=None, **kwargs):