Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace port 35357 with 5000 for test_clients.py"

Browse Source
This commit is contained in:
Zuul
2018-06-15 05:10:32 +00:00
committed by Gerrit Code Review
parent 44fc7d5799 d8872a743b
commit 3591d9fa0a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/tests/common/test_clients.py
View File

@@ -45,7 +45,7 @@ class TestClients(base.TestCase):
# ka_loading.load_auth_from_conf_options(CONF, _AUTH_CONF_GROUP) # ka_loading.load_auth_from_conf_options(CONF, _AUTH_CONF_GROUP)
# ka_loading.load_session_from_conf_options(CONF, _AUTH_CONF_GROUP) # ka_loading.load_session_from_conf_options(CONF, _AUTH_CONF_GROUP)
# CONF.set_override( # CONF.set_override(
# 'auth-url', 'http://server.ip:35357', group=_AUTH_CONF_GROUP) # 'auth-url', 'http://server.ip:5000', group=_AUTH_CONF_GROUP)
# If we don't clean up the _AUTH_CONF_GROUP conf options, then other # If we don't clean up the _AUTH_CONF_GROUP conf options, then other
# tests that run after this one will fail, complaining about required # tests that run after this one will fail, complaining about required
@@ -68,7 +68,7 @@ class TestClients(base.TestCase):
expected = {'username': 'foousername', expected = {'username': 'foousername',
'password': 'foopassword', 'password': 'foopassword',
'auth_url': 'http://server.ip:35357', 'auth_url': 'http://server.ip:5000',
'cafile': None, 'cafile': None,
'certfile': None, 'certfile': None,
'keyfile': None, 'keyfile': None,
@@ -99,7 +99,7 @@ class TestClients(base.TestCase):
expected = {'username': 'foousername', expected = {'username': 'foousername',
'password': 'foopassword', 'password': 'foopassword',
'auth_url': 'http://server.ip:35357', 'auth_url': 'http://server.ip:5000',
'user_domain_id': 'foouserdomainid', 'user_domain_id': 'foouserdomainid',
'project_domain_id': 'fooprojdomainid'} 'project_domain_id': 'fooprojdomainid'}
@@ -360,7 +360,7 @@ class TestClients(base.TestCase):
mock_call.assert_called_once_with( mock_call.assert_called_once_with(
CONF.monasca_client.api_version, CONF.monasca_client.api_version,
'test_endpoint', 'test_endpoint',
auth_url='http://server.ip:35357', cert_file=None, insecure=False, auth_url='http://server.ip:5000', cert_file=None, insecure=False,
key_file=None, keystone_timeout=None, os_cacert=None, key_file=None, keystone_timeout=None, os_cacert=None,
password='foopassword', service_type='monitoring', password='foopassword', service_type='monitoring',
token='test_token', username='foousername') token='test_token', username='foousername')