Switch back to traffic_server for now
Project: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/commit/6c5e66c4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/tree/6c5e66c4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/diff/6c5e66c4 Branch: refs/heads/master Commit: 6c5e66c41736a2c0259bd705d417513e8a4089f8 Parents: 8987fca Author: Thomas Jackson <[email protected]> Authored: Fri Jan 23 15:43:57 2015 -0800 Committer: Thomas Jackson <[email protected]> Committed: Fri Jan 23 15:43:57 2015 -0800 ---------------------------------------------------------------------- tsqa/environment.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver-qa/blob/6c5e66c4/tsqa/environment.py ---------------------------------------------------------------------- diff --git a/tsqa/environment.py b/tsqa/environment.py index c1eafd6..e1bf9fa 100644 --- a/tsqa/environment.py +++ b/tsqa/environment.py @@ -234,8 +234,11 @@ class Environment: return environ def __exec_cop(self): - path = os.path.join(self.layout.bindir, 'traffic_cop') - cmd = [path, '--debug', '--stdout'] + # TODO: re-enable after jpeach's patch lands to fix proxy.config.admin.user_id + #path = os.path.join(self.layout.bindir, 'traffic_cop') + #cmd = [path, '--debug', '--stdout'] + + cmd = [os.path.join(self.layout.bindir, 'traffic_server')] with open(os.path.join(self.layout.logdir, 'cop.log'), 'w+') as logfile: self.cop = subprocess.Popen(cmd, @@ -325,8 +328,9 @@ class Environment: admin_port = tsqa.utils.bind_unused_port()[1] self.hostports = [('127.0.0.1', http_server_port), - ('127.0.0.1', manager_mgmt_port), - ('127.0.0.1', admin_port), + # TODO: re-enable after jpeach's patch lands to fix proxy.config.admin.user_id + #('127.0.0.1', manager_mgmt_port), + #('127.0.0.1', admin_port), ] # overwrite a few things that need to be changed to have a unique env @@ -342,7 +346,7 @@ class Environment: 'proxy.config.process_manager.mgmt_port': manager_mgmt_port, # your own listen port 'proxy.config.admin.autoconf_port': admin_port, 'proxy.config.diags.show_location': 1, - 'proxy.config.admin.user_id': '#-1', + #'proxy.config.admin.user_id': '#-1', # set the process_server timeouts to 0 (faster startup) 'proxy.config.lm.pserver_timeout_secs': 0,
