trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dra...@apache.org
Subject [trafficserver] branch master updated: remove hack for traffic_top update base version to 1.4.1 for autest
Date Tue, 05 Dec 2017 19:46:46 GMT
This is an automated email from the ASF dual-hosted git repository.

dragon 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 edf59a8  remove hack for traffic_top update base version to 1.4.1 for autest
edf59a8 is described below

commit edf59a826334f19098f1f89c7e90b18124e9604c
Author: Jason Kenny <dragon512@live.com>
AuthorDate: Tue Dec 5 12:22:53 2017 -0600

    remove hack for traffic_top
    update base version to 1.4.1 for autest
---
 tests/gold_tests/autest-site/init.cli.ext           | 5 +++--
 tests/gold_tests/autest-site/trafficserver.test.ext | 7 +------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/gold_tests/autest-site/init.cli.ext b/tests/gold_tests/autest-site/init.cli.ext
index dbff075..633171c 100644
--- a/tests/gold_tests/autest-site/init.cli.ext
+++ b/tests/gold_tests/autest-site/init.cli.ext
@@ -23,9 +23,10 @@ if sys.version_info < (3, 5, 0):
     host.WriteError(
         "You need python 3.5 or later to run these tests\n", show_stack=False)
 
-if AuTestVersion() < "1.4.0":
+autest_version ="1.4.1"
+if AuTestVersion() < autest_version:
     host.WriteError(
-        "Tests need AuTest version 1.4.0 or better\n Please update AuTest:\n  pip install
--upgrade autest\n", show_stack=False)
+        "Tests need AuTest version {ver} or better\n Please update AuTest:\n  pip install
--upgrade autest\n".format(ver=autest_version), show_stack=False)
 
 
 Settings.path_argument(["--ats-bin"],
diff --git a/tests/gold_tests/autest-site/trafficserver.test.ext b/tests/gold_tests/autest-site/trafficserver.test.ext
index 33f4ef2..8007527 100755
--- a/tests/gold_tests/autest-site/trafficserver.test.ext
+++ b/tests/gold_tests/autest-site/trafficserver.test.ext
@@ -279,12 +279,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True):
     p.Env['PROXY_CONFIG_ADMIN_SYNTHETIC_PORT'] = str(p.Variables.admin_port)
     p.Env['PROXY_CONFIG_ADMIN_AUTOCONF_PORT'] = str(
         p.Variables.admin_port)  # support pre ATS 6.x
-    # This is a hack to deal with a leak issue in traffic_cop
-    # I need to address this better in AuTest, however it is more complex at the 
-    # moment to deal with a rogue process in a process group than it is to do "old" behavior
-    if command == "traffic_cop":
-        p.ReturnCode = None
-        p.Variables.Autest.KillDelaySecond = 0
+    
     if command == "traffic_manager":
         p.ReturnCode = 2
     else:

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message