From 2e7b4f2027a1147ca28301e4f88adf8274b39a1f Mon Sep 17 00:00:00 2001 From: DUVAL Thomas Date: Thu, 9 Jun 2016 09:11:50 +0200 Subject: Update Keystone core to Mitaka. Change-Id: Ia10d6add16f4a9d25d1f42d420661c46332e69db --- .../tests/functional/shared/test_running.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'keystone-moon/keystone/tests/functional/shared') diff --git a/keystone-moon/keystone/tests/functional/shared/test_running.py b/keystone-moon/keystone/tests/functional/shared/test_running.py index aed48ac2..1b46b32d 100644 --- a/keystone-moon/keystone/tests/functional/shared/test_running.py +++ b/keystone-moon/keystone/tests/functional/shared/test_running.py @@ -13,38 +13,46 @@ import requests import testtools.matchers +from keystone.tests.functional import core as functests + is_multiple_choices = testtools.matchers.Equals( requests.status_codes.codes.multiple_choices) is_ok = testtools.matchers.Equals(requests.status_codes.codes.ok) -admin_url = 'http://localhost:35357' -public_url = 'http://localhost:5000' versions = ('v2.0', 'v3') -class TestServerRunning(testtools.TestCase): +class TestServerRunning(functests.BaseTestCase): def test_admin_responds_with_multiple_choices(self): - resp = requests.get(admin_url) + resp = requests.get(self.ADMIN_URL) self.assertThat(resp.status_code, is_multiple_choices) def test_admin_versions(self): for version in versions: - resp = requests.get(admin_url + '/' + version) + resp = requests.get(self.ADMIN_URL + '/' + version) self.assertThat( resp.status_code, testtools.matchers.Annotate( 'failed for version %s' % version, is_ok)) def test_public_responds_with_multiple_choices(self): - resp = requests.get(public_url) + resp = requests.get(self.PUBLIC_URL) self.assertThat(resp.status_code, is_multiple_choices) def test_public_versions(self): for version in versions: - resp = requests.get(public_url + '/' + version) + resp = requests.get(self.PUBLIC_URL + '/' + version) self.assertThat( resp.status_code, testtools.matchers.Annotate( 'failed for version %s' % version, is_ok)) + + def test_get_user_token(self): + token = self.get_scoped_user_token() + self.assertIsNotNone(token) + + def test_get_admin_token(self): + token = self.get_scoped_admin_token() + self.assertIsNotNone(token) -- cgit 1.2.3-korg