You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2021/08/25 01:02:24 UTC
[trafficserver] 01/01: Revert "Use better done file locations for
some AuTests (#8274)"
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch revert-8274-better_autest_done_file_handling
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 12da97920d83c27c93336368ad6ec3f8ff939f4e
Author: Brian Neradt <br...@verizonmedia.com>
AuthorDate: Tue Aug 24 20:02:12 2021 -0500
Revert "Use better done file locations for some AuTests (#8274)"
This reverts commit edef25cc5ddf1355009bdabcdf68b59c88218833.
---
tests/.gitignore | 1 +
tests/gold_tests/continuations/double_h2.test.py | 10 ++++------
tests/gold_tests/continuations/openclose.test.py | 10 ++++------
tests/gold_tests/continuations/openclose_h2.test.py | 10 ++++------
4 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/tests/.gitignore b/tests/.gitignore
index 4cbfa0f..bafde3c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,2 @@
_sandbox/
+done
diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py
index a8bc084..0730933 100644
--- a/tests/gold_tests/continuations/double_h2.test.py
+++ b/tests/gold_tests/continuations/double_h2.test.py
@@ -109,12 +109,10 @@ tr.StillRunningAfter = ts
def make_done_stat_ready(tsenv):
def done_stat_ready(process, hasRunFor, **kw):
- retval = subprocess.run(
- "traffic_ctl metric get continuations_verify.test.done",
- shell=True,
- capture_output=True,
- env=tsenv)
- return retval.returncode == 0 and b'1' in retval.stdout
+ retval = subprocess.run("traffic_ctl metric get continuations_verify.test.done > done 2> /dev/null", shell=True, env=tsenv)
+ if retval.returncode == 0:
+ retval = subprocess.run("grep 1 done > /dev/null", shell=True, env=tsenv)
+ return retval.returncode == 0
return done_stat_ready
diff --git a/tests/gold_tests/continuations/openclose.test.py b/tests/gold_tests/continuations/openclose.test.py
index 44912f6..bebc40c 100644
--- a/tests/gold_tests/continuations/openclose.test.py
+++ b/tests/gold_tests/continuations/openclose.test.py
@@ -86,12 +86,10 @@ tr.StillRunningAfter = ts
def make_done_stat_ready(tsenv):
def done_stat_ready(process, hasRunFor, **kw):
- retval = subprocess.run(
- "traffic_ctl metric get ssntxnorder_verify.test.done",
- shell=True,
- capture_output=True,
- env=tsenv)
- return retval.returncode == 0 and b'1' in retval.stdout
+ retval = subprocess.run("traffic_ctl metric get ssntxnorder_verify.test.done > done 2> /dev/null", shell=True, env=tsenv)
+ if retval.returncode == 0:
+ retval = subprocess.run("grep 1 done > /dev/null", shell=True, env=tsenv)
+ return retval.returncode == 0
return done_stat_ready
diff --git a/tests/gold_tests/continuations/openclose_h2.test.py b/tests/gold_tests/continuations/openclose_h2.test.py
index 084a827..90e4542 100644
--- a/tests/gold_tests/continuations/openclose_h2.test.py
+++ b/tests/gold_tests/continuations/openclose_h2.test.py
@@ -99,12 +99,10 @@ tr.StillRunningAfter = ts
def make_done_stat_ready(tsenv):
def done_stat_ready(process, hasRunFor, **kw):
- retval = subprocess.run(
- "traffic_ctl metric get ssntxnorder_verify.test.done",
- shell=True,
- capture_output=True,
- env=tsenv)
- return retval.returncode == 0 and b'1' in retval.stdout
+ retval = subprocess.run("traffic_ctl metric get ssntxnorder_verify.test.done > done 2> /dev/null", shell=True, env=tsenv)
+ if retval.returncode == 0:
+ retval = subprocess.run("grep 1 done > /dev/null", shell=True, env=tsenv)
+ return retval.returncode == 0
return done_stat_ready