openstack/keystoneauth
Code Issues Proposed changes

Correct betamax fixture for more strict IDNA

Browse Source 
The IDNA library has gotten more strict. The use of `_` in the TLD is
not valid. This change modifies the betamax test-case to use
`keystoneauth-betamax.test` instead of `keystoneauth.betamax_test`
correcting the invalid character in the TLD.

Change-Id: I01c5e6c0145158515d837b216fd066a5a558f498
This commit is contained in:
Morgan Fainberg 2016-11-16 16:26:54 -08:00
parent 42a6bf8dfc
commit 6858ccdd0f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneauth1/tests/unit/data/ksa_betamax_test_cassette.yaml
View File

@ -26,7 +26,7 @@ http_interactions:
Content-Type:
- application/json
method: POST
uri: http://keystoneauth.betamax_test/v2.0/tokens
uri: http://keystoneauth-betamax.test/v2.0/tokens
response:
body:
string: |-
@ -86,7 +86,7 @@ http_interactions:
status:
message: OK
code: 200
url: http://keystoneauth.betamax_test/v2.0/tokens
url: http://keystoneauth-betamax.test/v2.0/tokens
recorded_at: '2015-11-27T15:17:19'
recorded_with: betamax/0.5.1

2
keystoneauth1/tests/unit/data/ksa_serializer_data.json
View File

@ -1 +1 @@
{"http_interactions": [{"request": {"body": {"string": "{\"auth\": {\"tenantName\": \"test_tenant_name\", \"passwordCredentials\": {\"username\": \"test_user_name\", \"password\": \"test_password\"}}}", "encoding": "utf-8"}, "headers": {"Content-Length": ["128"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["application/json"], "User-Agent": ["keystoneauth1"], "Connection": ["keep-alive"], "Content-Type": ["application/json"]}, "method": "POST", "uri": "http://keystoneauth.betamax_test/v2.0/tokens"}, "response": {"body": {"string": "{\"access\": {\"token\": {\"issued_at\": \"2015-11-27T15:17:19.755470\", \"expires\": \"2015-11-27T16:17:19Z\", \"id\": \"c000c5ee4ba04594a00886028584b50d\", \"tenant\": {\"description\": null, \"enabled\": true, \"id\": \"6932cad596634a61ac9c759fb91beef1\", \"name\": \"test_tenant_name\"}, \"audit_ids\": [\"jY3gYg_YTbmzY2a4ioGuCw\"]}, \"user\": {\"username\": \"test_user_name\", \"roles_links\": [], \"id\": \"96995e6cc15b40fa8e7cd762f6a5d4c0\", \"roles\": [{\"name\": \"_member_\"}], \"name\": \"67eff5f6-9477-4961-88b4-437e6596a795\"}, \"metadata\": {\"is_admin\": 0, \"roles\": [\"9fe2ff9ee4384b1894a90878d3e92bab\"]}}}", "encoding": null}, "headers": {"X-Openstack-Request-Id": ["req-f9e188b4-06fd-4a4c-a952-2315b368218c"], "Content-Length": ["2684"], "Connection": ["keep-alive"], "Date": ["Fri, 27 Nov 2015 15:17:19 GMT"], "Content-Type": ["application/json"], "Vary": ["X-Auth-Token"], "X-Distribution": ["Ubuntu"], "Server": ["Fake"]}, "status": {"message": "OK", "code": 200}, "url": "http://keystoneauth.betamax_test/v2.0/tokens"}, "recorded_at": "2015-11-27T15:17:19"}], "recorded_with": "betamax/0.5.1"}
{"http_interactions": [{"request": {"body": {"string": "{\"auth\": {\"tenantName\": \"test_tenant_name\", \"passwordCredentials\": {\"username\": \"test_user_name\", \"password\": \"test_password\"}}}", "encoding": "utf-8"}, "headers": {"Content-Length": ["128"], "Accept-Encoding": ["gzip, deflate"], "Accept": ["application/json"], "User-Agent": ["keystoneauth1"], "Connection": ["keep-alive"], "Content-Type": ["application/json"]}, "method": "POST", "uri": "http://keystoneauth-betamax.test/v2.0/tokens"}, "response": {"body": {"string": "{\"access\": {\"token\": {\"issued_at\": \"2015-11-27T15:17:19.755470\", \"expires\": \"2015-11-27T16:17:19Z\", \"id\": \"c000c5ee4ba04594a00886028584b50d\", \"tenant\": {\"description\": null, \"enabled\": true, \"id\": \"6932cad596634a61ac9c759fb91beef1\", \"name\": \"test_tenant_name\"}, \"audit_ids\": [\"jY3gYg_YTbmzY2a4ioGuCw\"]}, \"user\": {\"username\": \"test_user_name\", \"roles_links\": [], \"id\": \"96995e6cc15b40fa8e7cd762f6a5d4c0\", \"roles\": [{\"name\": \"_member_\"}], \"name\": \"67eff5f6-9477-4961-88b4-437e6596a795\"}, \"metadata\": {\"is_admin\": 0, \"roles\": [\"9fe2ff9ee4384b1894a90878d3e92bab\"]}}}", "encoding": null}, "headers": {"X-Openstack-Request-Id": ["req-f9e188b4-06fd-4a4c-a952-2315b368218c"], "Content-Length": ["2684"], "Connection": ["keep-alive"], "Date": ["Fri, 27 Nov 2015 15:17:19 GMT"], "Content-Type": ["application/json"], "Vary": ["X-Auth-Token"], "X-Distribution": ["Ubuntu"], "Server": ["Fake"]}, "status": {"message": "OK", "code": 200}, "url": "http://keystoneauth-betamax.test/v2.0/tokens"}, "recorded_at": "2015-11-27T15:17:19"}], "recorded_with": "betamax/0.5.1"}

2
keystoneauth1/tests/unit/test_betamax_fixture.py
View File

@ -25,7 +25,7 @@ class TestBetamaxFixture(testtools.TestCase):
TEST_USERNAME = 'test_user_name'
TEST_PASSWORD = 'test_password'
TEST_TENANT_NAME = 'test_tenant_name'
TEST_AUTH_URL = 'http://keystoneauth.betamax_test/v2.0/'
TEST_AUTH_URL = 'http://keystoneauth-betamax.test/v2.0/'
V2_TOKEN = v2Fixtures.Token(tenant_name=TEST_TENANT_NAME,
user_name=TEST_USERNAME)

4
keystoneauth1/tests/unit/test_betamax_serializer.py
View File

@ -36,7 +36,7 @@ class TestBetamaxSerializer(testtools.TestCase):
data = self.serializer.deserialize(open(self.TEST_FILE, 'r').read())
request = data['http_interactions'][0]['request']
self.assertEqual(
'http://keystoneauth.betamax_test/v2.0/tokens',
'http://keystoneauth-betamax.test/v2.0/tokens',
request['uri'])
payload = json.loads(request['body']['string'])
self.assertEqual('test_tenant_name', payload['auth']['tenantName'])
@ -47,7 +47,7 @@ class TestBetamaxSerializer(testtools.TestCase):
data = yaml.load(serialized)
request = data['http_interactions'][0]['request']
self.assertEqual(
'http://keystoneauth.betamax_test/v2.0/tokens',
'http://keystoneauth-betamax.test/v2.0/tokens',
request['uri'])
payload = json.loads(request['body']['string'])
self.assertEqual('test_tenant_name', payload['auth']['tenantName'])