[trafficserver] branch 7.1.x updated: Manually merging changes from #4442

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/7.1.x by this push:
     new 3811947  Manually merging changes from #4442
3811947 is described below

commit 3811947a28ac791fd87c34d9c4c05160164659e3
Author: ezelko260 <ev...@comcast.com>
AuthorDate: Thu Feb 14 21:25:12 2019 +0000

    Manually merging changes from #4442
---
 proxy/InkAPI.cc                                       | 8 +-------
 tests/gold_tests/headers/domain-blacklist-30x.test.py | 3 +++
 tests/gold_tests/pluginTest/url_sig/url_sig.test.py   | 3 +++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index b8c9181..473228f 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -384,14 +384,8 @@ TSError(const char *fmt, ...)
 {
   va_list args;
 
-  if (is_action_tag_set("deft") || is_action_tag_set("sdk_vbos_errors")) {
-    va_start(args, fmt);
-    ErrorV(fmt, args);
-    va_end(args);
-  }
-
   va_start(args, fmt);
-  Log::va_error((char *)fmt, args);
+  ErrorV(fmt, args);
   va_end(args);
 }
 
diff --git a/tests/gold_tests/headers/domain-blacklist-30x.test.py b/tests/gold_tests/headers/domain-blacklist-30x.test.py
index 172ccf4..3d86fbb 100644
--- a/tests/gold_tests/headers/domain-blacklist-30x.test.py
+++ b/tests/gold_tests/headers/domain-blacklist-30x.test.py
@@ -112,3 +112,6 @@ passthroughtr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0} {1}
 passthroughtr.Processes.Default.TimeOut=5 # seconds
 passthroughtr.Processes.Default.ReturnCode=0
 passthroughtr.Processes.Default.Streams.stdout="passthrough_get.gold"
+
+# Overriding the built in ERROR check since we expect some ERROR messages
+ts.Disk.diags_log.Content = Testers.ContainsExpression("unsupported redirect status 0", "This test is a failure test")
diff --git a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
index 26d92d3..19af447 100644
--- a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
+++ b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
@@ -254,3 +254,6 @@ tr.Processes.Default.Command = (
     "foo/abcde/qrstuvwxyz?E=33046618506&A=1&K=7&P=1&S=acae22b0e1ba6ea6fbb5d26018dbf152558e98cb'" +
     LogTee + " ; grep -F -e '< HTTP' -e Authorization {0}/url_sig_long.log > {0}/url_sig_short.log ".format(ts.RunDirectory)
 )
+
+# Overriding the built in ERROR check since we expect some ERROR messages
+ts.Disk.diags_log.Content = Testers.ContainsExpression("ERROR", "Some tests are failure tests")