openstack/keystone
Code Issues Proposed changes

Update keystone functional tests

Browse Source 
This change removes v2.0 from the list of versions to test when
running keystone's own functional tests. This also adds in project_name
and project_domain_id when specifying parameters to build an
authentication request.

Change-Id: I960935d8e8daf51a39e2ea7d9d53af1d9eefdbb2
This commit is contained in:
Gage Hugo 2018-04-10 14:16:53 -05:00
parent 395c7088c2
commit 42e45c2058
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keystone/tests/functional/core.py
View File

@ -24,7 +24,7 @@ class BaseTestCase(testtools.TestCase, common_auth.AuthTestMixin):
def setUp(self):
self.ADMIN_URL = os.environ.get('KSTEST_ADMIN_URL',
'http://localhost:35357')
'http://localhost:5000')
self.PUBLIC_URL = os.environ.get('KSTEST_PUBLIC_URL',
'http://localhost:5000')
self.admin = {
@ -40,6 +40,8 @@ class BaseTestCase(testtools.TestCase, common_auth.AuthTestMixin):
}
self.project_id = os.environ.get('KSTEST_PROJECT_ID')
self.project_name = os.environ.get('KSTEST_PROJECT_NAME')
self.project_domain_id = os.environ.get('KSTEST_PROJECT_DOMAIN_ID')
super(BaseTestCase, self).setUp()
@ -59,7 +61,8 @@ class BaseTestCase(testtools.TestCase, common_auth.AuthTestMixin):
"""
body = self.build_authentication_request(
username=user['name'], user_domain_name=user['domain_id'],
password=user['password'], project_id=self.project_id)
password=user['password'], project_name=self.project_name,
project_domain_id=self.project_domain_id)
return requests.post(self.PUBLIC_URL + '/v3/auth/tokens',
headers=self.request_headers,
json=body)

2
keystone/tests/functional/shared/test_running.py
View File

@ -20,7 +20,7 @@ is_multiple_choices = testtools.matchers.Equals(
requests.status_codes.codes.multiple_choices)
is_ok = testtools.matchers.Equals(requests.status_codes.codes.ok)
versions = ('v2.0', 'v3')
versions = ['v3']
class TestServerRunning(functests.BaseTestCase):