[trafficserver] branch master updated (5a4dc36 -> 7003f36)

[bcall]

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

bcall pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 5a4dc36  Make post_slow_server Au test work in Docker container.
 add 7003f36  Fixes remaining memory leaks with nexthop strategy unit tests 
found by ASAN. This should close issue 6765

No new revisions were added by this update.

Summary of changes:
 proxy/http/remap/NextHopStrategyFactory.cc |  1 +
 proxy/http/remap/unit-tests/nexthop_test_stubs.cc  | 42 
 proxy/http/remap/unit-tests/nexthop_test_stubs.h   |  4 ++
 .../remap/unit-tests/test_NextHopConsistentHash.cc | 56 --
 4 files changed, 57 insertions(+), 46 deletions(-)

[trafficserver] branch master updated: Make post_slow_server Au test work in Docker container.

[rrm]

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

rrm 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 5a4dc36  Make post_slow_server Au test work in Docker container.
5a4dc36 is described below

commit 5a4dc365ae67dd02af0305dbb7c23ee33640b6bb
Author: Walter Karas 
AuthorDate: Wed May 20 19:53:55 2020 -0500

Make post_slow_server Au test work in Docker container.

For some reason, redirecting standard error into standard output for a curl 
command causes a line of standard output
to be lost when running in my Linux Docker container on MacOS.  Also made a 
few other small tweaks to the test.
---
 tests/gold_tests/post_slow_server/check.sh | 10 +-
 tests/gold_tests/post_slow_server/post_slow_server.test.py |  3 +--
 tests/gold_tests/post_slow_server/server.sh| 12 +++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/tests/gold_tests/post_slow_server/check.sh 
b/tests/gold_tests/post_slow_server/check.sh
index 73220b0..4d5f189 100755
--- a/tests/gold_tests/post_slow_server/check.sh
+++ b/tests/gold_tests/post_slow_server/check.sh
@@ -16,4 +16,12 @@
 
 # Check that curl command received 200 KBytes of data (in 8-byte lines).
 
-(( $( grep '^1234567$' curl.log | wc -l ) == ((200 * 1024) / 8) ))
+RECEIVED=$( grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' curl.log | wc -l )
+let RECEIVED=8*RECEIVED
+
+EXPECTED=$((200 * 1024))
+
+echo "Exepcted=$EXPECTED"
+echo "Recieved=$RECEIVED"
+
+(( RECEIVED == EXPECTED ))
diff --git a/tests/gold_tests/post_slow_server/post_slow_server.test.py 
b/tests/gold_tests/post_slow_server/post_slow_server.test.py
index 8d12ee4..9ec0856 100644
--- a/tests/gold_tests/post_slow_server/post_slow_server.test.py
+++ b/tests/gold_tests/post_slow_server/post_slow_server.test.py
@@ -61,8 +61,7 @@ server = Test.Processes.Process(
 tr = Test.AddTestRun()
 tr.Processes.Default.Command = (
 'curl --request POST --verbose --ipv4 --http2 --insecure --header 
"Content-Length: 0"' +
-r" --header 'Host: localhost' https://localhost:{}/xyz 2>&1 | tr '\r' '\n' 
".format(ts.Variables.ssl_port) +
-' > curl.log'
+" --header 'Host: localhost' https://localhost:{}/xyz >curl.log 
2>curl.err".format(ts.Variables.ssl_port)
 )
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.StartBefore(server)
diff --git a/tests/gold_tests/post_slow_server/server.sh 
b/tests/gold_tests/post_slow_server/server.sh
index 7f4e7c3..6f40510 100755
--- a/tests/gold_tests/post_slow_server/server.sh
+++ b/tests/gold_tests/post_slow_server/server.sh
@@ -24,14 +24,16 @@ response ()
   #
   while (( 1 == 1 ))
   do
-if tr '\r' '=' < rcv_file | grep '^=$' > /dev/null
-then
-  break;
+if [[ -f rcv_file ]] ; then
+  if tr '\r' '=' < rcv_file | grep '^=$' > /dev/null
+  then
+break;
+  fi
 fi
 sleep 1
   done
 
-  sleep 2m
+  date >&2 ; sleep 2m ; date >&2
 
   # Send back 200 KBytes of data
 
@@ -42,8 +44,8 @@ response ()
   let I=0
   while (( I < ((200 * 1024) / 8) ))
   do
-printf "1234567\n"
 let I=I+1
+printf "%07.7u\n" $((I * 8))
   done
 }