openstack/deb-python-keystoneclient
Code Issues Proposed changes

Fix tests to work with requests<2.3

Browse Source 
The tests didn't pass with requests<2.3 because of the cookies
monkey-patching.

To test this, make sure the requests library in your tox venv is
the right level:

 $ .tox/py27/bin/pip install -U "requests<2.3"

Then run the tests.

Closes-Bug: 1442919
Change-Id: Ie93906ba2370dada2386a50ae2137337ccf98f10
This commit is contained in:
Brant Knudson
2015-04-11 10:28:49 -05:00
parent e79d571aa6
commit a335b7f6f2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
keystoneclient/tests/unit/v3/test_auth_saml2.py
View File

@@ -583,9 +583,8 @@ class AuthenticateviaADFSTests(utils.TestCase):
self.session) self.session)
def test_access_sp_no_cookies_fail(self): def test_access_sp_no_cookies_fail(self):
# clean cookie jar # There are no cookies in the session initially, and
self.session.session.cookies = [] # _access_service_provider requires a cookie in the session.
self.assertRaises(exceptions.AuthorizationFailure, self.assertRaises(exceptions.AuthorizationFailure,
self.adfsplugin._access_service_provider, self.adfsplugin._access_service_provider,
self.session) self.session)
@@ -595,7 +594,11 @@ class AuthenticateviaADFSTests(utils.TestCase):
json=saml2_fixtures.UNSCOPED_TOKEN, json=saml2_fixtures.UNSCOPED_TOKEN,
headers=client_fixtures.AUTH_RESPONSE_HEADERS) headers=client_fixtures.AUTH_RESPONSE_HEADERS)
self.session.session.cookies = [object()] # _access_service_provider requires a cookie in the session.
cookie = requests.cookies.create_cookie(
name=self.getUniqueString(), value=self.getUniqueString())
self.session.session.cookies.set_cookie(cookie)
self.adfsplugin._access_service_provider(self.session) self.adfsplugin._access_service_provider(self.session)
response = self.adfsplugin.authenticated_response response = self.adfsplugin.authenticated_response
@@ -618,7 +621,10 @@ class AuthenticateviaADFSTests(utils.TestCase):
# NOTE(marek-denis): We need to mimic this until self.requests_mock can # NOTE(marek-denis): We need to mimic this until self.requests_mock can
# issue cookies properly. # issue cookies properly.
self.session.session.cookies = [object()] cookie = requests.cookies.create_cookie(
name=self.getUniqueString(), value=self.getUniqueString())
self.session.session.cookies.set_cookie(cookie)
token, token_json = self.adfsplugin._get_unscoped_token(self.session) token, token_json = self.adfsplugin._get_unscoped_token(self.session)
self.assertEqual(token, client_fixtures.AUTH_SUBJECT_TOKEN) self.assertEqual(token, client_fixtures.AUTH_SUBJECT_TOKEN)
self.assertEqual(saml2_fixtures.UNSCOPED_TOKEN['token'], token_json) self.assertEqual(saml2_fixtures.UNSCOPED_TOKEN['token'], token_json)