openstack
/
keystone
Code Issues Proposed changes

Made tests use both service and admin endpoints

This commit is contained in:
Devin Carlen 2011-12-29 20:51:11 -08:00 committed by termie
parent 2fb294f680
commit c5b1b6fb05
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_keystoneclient_compat.py
View File

@ -13,12 +13,22 @@ class CompatTestCase(test.TestCase):
def _public_url(self):
public_port = self.public_server.socket_info['socket'][1]
self.options['public_port'] = public_port
<<<<<<< HEAD
return "http://localhost:%s/v2.0" % public_port
=======
# NOTE(termie): novaclient wants a "/" at the end, keystoneclient does not
return "http://localhost:%s/v2.0/" % public_port
>>>>>>> Made tests use both service and admin endpoints
def _admin_url(self):
admin_port = self.admin_server.socket_info['socket'][1]
self.options['admin_port'] = admin_port
<<<<<<< HEAD
return "http://localhost:%s/v2.0" % admin_port
=======
# NOTE(termie): novaclient wants a "/" at the end, keystoneclient does not
return "http://localhost:%s/v2.0/" % admin_port
>>>>>>> Made tests use both service and admin endpoints
def _client(self, **kwargs):
from keystoneclient.v2_0 import client as ks_client
@ -68,7 +78,7 @@ class MasterCompatTestCase(CompatTestCase):
password='foo2',
tenant_name='BAR')
def test_authenticate(self):
def test_authenticate_tenant_name_and_tenants(self):
client = self._client(username='FOO',
password='foo2',
tenant_id='bar')
@ -218,4 +228,3 @@ class MasterCompatTestCase(CompatTestCase):
services = client.services.list()
# TODO(devcamcar): This assert should be more specific.
self.assertTrue(len(services) > 0)