summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kajinami <tkajinam@redhat.com>2019-09-06 15:03:38 +0900
committerTakashi Kajinami <tkajinam@redhat.com>2019-09-06 10:08:39 +0000
commit27d4376ea57be9944ee5eb0601157f8996de077f (patch)
treef522e49378fc285e1861b71e1c77743d221a57d7
parentf7e75f43d811c8e1028746b2574322afa53dbaac (diff)
downloadpython-keystoneclient-27d4376ea57be9944ee5eb0601157f8996de077f.tar.gz
Fix unit tests broken by requests-mock
Now requests-mock records request url in log[1], so it is invalid to check that the logger output does NOT contain request url. Also, fix url passed to request mock as now it requires complete url is passed [1] https://github.com/jamielennox/requests-mock/pull/93 Change-Id: I4bab30a6705b7cab6b5a569dd61c442263e39995
-rw-r--r--keystoneclient/tests/unit/test_session.py2
-rw-r--r--keystoneclient/tests/unit/v3/test_role_assignments.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/keystoneclient/tests/unit/test_session.py b/keystoneclient/tests/unit/test_session.py
index e0d9b28..bf10aa3 100644
--- a/keystoneclient/tests/unit/test_session.py
+++ b/keystoneclient/tests/unit/test_session.py
@@ -828,7 +828,6 @@ class SessionAuthTests(utils.TestCase):
self.assertIn(list(response.keys())[0], output)
self.assertIn(list(response.values())[0], output)
- self.assertNotIn(self.TEST_URL, self.logger.output)
self.assertNotIn(list(response.keys())[0], self.logger.output)
self.assertNotIn(list(response.values())[0], self.logger.output)
@@ -1026,7 +1025,6 @@ class AdapterTest(utils.TestCase):
self.assertIn(list(response.keys())[0], output)
self.assertIn(list(response.values())[0], output)
- self.assertNotIn(self.TEST_URL, self.logger.output)
self.assertNotIn(list(response.keys())[0], self.logger.output)
self.assertNotIn(list(response.values())[0], self.logger.output)
diff --git a/keystoneclient/tests/unit/v3/test_role_assignments.py b/keystoneclient/tests/unit/v3/test_role_assignments.py
index 45dd13d..39b4b23 100644
--- a/keystoneclient/tests/unit/v3/test_role_assignments.py
+++ b/keystoneclient/tests/unit/v3/test_role_assignments.py
@@ -265,7 +265,7 @@ class RoleAssignmentsTests(utils.ClientTestCase, utils.CrudTests):
ref_list = self.TEST_ALL_RESPONSE_LIST
self.stub_entity('GET',
[self.collection_key,
- '?include_names'],
+ '?include_names=True'],
entity=ref_list)
returned_list = self.manager.list(include_names=True)