You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ja...@apache.org on 2015/02/06 23:02:20 UTC
[3/7] trafficserver-qa git commit: Switch back to traffic_cop
Switch back to traffic_cop
Project: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/commit/67dc45a2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/tree/67dc45a2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver-qa/diff/67dc45a2
Branch: refs/heads/master
Commit: 67dc45a2b2b1cb36f31a578c41178351b7bf5757
Parents: 692d1d8
Author: Thomas Jackson <ja...@gmail.com>
Authored: Tue Jan 27 15:39:09 2015 -0800
Committer: Thomas Jackson <ja...@gmail.com>
Committed: Tue Jan 27 15:39:09 2015 -0800
----------------------------------------------------------------------
tsqa/environment.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver-qa/blob/67dc45a2/tsqa/environment.py
----------------------------------------------------------------------
diff --git a/tsqa/environment.py b/tsqa/environment.py
index c11ac2d..e9543cc 100644
--- a/tsqa/environment.py
+++ b/tsqa/environment.py
@@ -239,11 +239,8 @@ class Environment:
return environ
def __exec_cop(self):
- # 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')]
+ path = os.path.join(self.layout.bindir, 'traffic_cop')
+ cmd = [path, '--debug', '--stdout']
with open(os.path.join(self.layout.logdir, 'cop.log'), 'w+') as logfile:
self.cop = subprocess.Popen(cmd,
@@ -293,7 +290,7 @@ class Environment:
"""
# First, make the prefix directory.
if self.layout is None:
- self.layout = Layout(tempfile.mkdtemp(prefix=os.environ.get('TSQA_LAYOUT_PREFIX', '')))
+ self.layout = Layout(tempfile.mkdtemp(prefix=os.environ.get('TSQA_LAYOUT_PREFIX', 'tsqa.env.')))
else:
os.makedirs(self.layout.prefix)
os.chmod(self.layout.prefix, 0777) # Make the tmp dir readable by all