From d8872a743be91c2c99f9dd8d81be6721c66aea9f Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sat, 12 May 2018 22:57:43 +0800 Subject: [PATCH] Replace port 35357 with 5000 for test_clients.py Now that the v2.0 API has been removed, we don't have a reason to include deployment instructions for two separate applications on different ports. Related-bug: #1754104 Change-Id: I98fae626d39cb62ad51c86435c1a2c60be5c1fb9 --- watcher/tests/common/test_clients.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watcher/tests/common/test_clients.py b/watcher/tests/common/test_clients.py index 3511d813a..36bdc366f 100755 --- a/watcher/tests/common/test_clients.py +++ b/watcher/tests/common/test_clients.py @@ -45,7 +45,7 @@ class TestClients(base.TestCase): # ka_loading.load_auth_from_conf_options(CONF, _AUTH_CONF_GROUP) # ka_loading.load_session_from_conf_options(CONF, _AUTH_CONF_GROUP) # 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 # tests that run after this one will fail, complaining about required @@ -68,7 +68,7 @@ class TestClients(base.TestCase): expected = {'username': 'foousername', 'password': 'foopassword', - 'auth_url': 'http://server.ip:35357', + 'auth_url': 'http://server.ip:5000', 'cafile': None, 'certfile': None, 'keyfile': None, @@ -99,7 +99,7 @@ class TestClients(base.TestCase): expected = {'username': 'foousername', 'password': 'foopassword', - 'auth_url': 'http://server.ip:35357', + 'auth_url': 'http://server.ip:5000', 'user_domain_id': 'foouserdomainid', 'project_domain_id': 'fooprojdomainid'} @@ -360,7 +360,7 @@ class TestClients(base.TestCase): mock_call.assert_called_once_with( CONF.monasca_client.api_version, '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, password='foopassword', service_type='monitoring', token='test_token', username='foousername')