This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 290fe4b Fixes some tls autests on macOS
290fe4b is described below
commit 290fe4bff10b04eb9d3cdeabd13ee9789e84a6d6
Author: Randall Meyer <r...@apache.org>
AuthorDate: Mon Mar 23 12:51:05 2020 -0700
Fixes some tls autests on macOS
on macOS, wc precedes output with spaces
---
tests/gold_tests/tls/tls_client_cert.test.py | 2 +-
tests/gold_tests/tls/tls_tunnel.test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/gold_tests/tls/tls_client_cert.test.py
b/tests/gold_tests/tls/tls_client_cert.test.py
index 6732c45..89a1f9b 100644
--- a/tests/gold_tests/tls/tls_client_cert.test.py
+++ b/tests/gold_tests/tls/tls_client_cert.test.py
@@ -175,7 +175,7 @@ tr2.Processes.Default.ReturnCode = 0
# At that point the new sni settings are ready to go
def sni_reload_done(tsenv):
def done_reload(process, hasRunFor, **kw):
- cmd = "grep 'sni.yaml finished loading' {0} | wc -l >
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+ cmd = "grep 'sni.yaml finished loading' {0} | wc -l | sed -e 's/ //g'>
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
retval = subprocess.run(cmd, shell=True, env=tsenv)
if retval.returncode == 0:
cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then
true; else false; fi".format(Test.RunDirectory)
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py
b/tests/gold_tests/tls/tls_tunnel.test.py
index 0a7196f..3811a9b 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -152,7 +152,7 @@ trreload.Processes.Default.ReturnCode = 0
# At that point the new sni settings are ready to go
def sni_reload_done(tsenv):
def done_reload(process, hasRunFor, **kw):
- cmd = "grep 'sni.yaml finished loading' {0} | wc -l >
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
+ cmd = "grep 'sni.yaml finished loading' {0} | wc -l | sed -e 's/ //g' >
{1}/test.out".format(ts.Disk.diags_log.Name, Test.RunDirectory)
retval = subprocess.run(cmd, shell=True, env=tsenv)
if retval.returncode == 0:
cmd ="if [ -f {0}/test.out -a \"`cat {0}/test.out`\" = \"2\" ] ; then
true; else false; fi".format(Test.RunDirectory)
