[trafficserver] branch 9.0.x updated: Make chunked encoding test more resilient (#6827)

[zw...@apache.org]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 93dcee1  Make chunked encoding test more resilient (#6827)
93dcee1 is described below

commit 93dcee18247d18387fe1b3870a99ae1ef1dbaa0c
Author: Susan Hinrichs <sh...@yahoo-inc.com>
AuthorDate: Wed May 27 08:13:21 2020 -0500

    Make chunked encoding test more resilient (#6827)
    
    Co-authored-by: Susan Hinrichs <sh...@verizonmedia.com>
    (cherry picked from commit 067f9d509ee30986acf516c40567feb223ce967b)
---
 tests/gold_tests/chunked_encoding/case4.sh                 | 2 +-
 tests/gold_tests/chunked_encoding/chunked_encoding.test.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/gold_tests/chunked_encoding/case4.sh b/tests/gold_tests/chunked_encoding/case4.sh
index e9b25da..aa51378 100644
--- a/tests/gold_tests/chunked_encoding/case4.sh
+++ b/tests/gold_tests/chunked_encoding/case4.sh
@@ -14,6 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-nc -l 8888 -o outserver4 -c "sh ./server4.sh" &
+nc -l ${2} -o outserver4 -c "sh ./server4.sh" &
 sleep 1
 ./smuggle-client 127.0.0.1 ${1}
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 60cd4dc..fdea251 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -25,6 +25,8 @@ Test.SkipUnless(
 )
 Test.ContinueOnFail = True
 
+Test.GetTcpPort("upstream_port")
+
 # Define default ATS
 ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
 server = Test.MakeOriginServer("server")
@@ -81,7 +83,7 @@ ts.Disk.remap_config.AddLine(
     'map https://www.anotherexample.com https://127.0.0.1:{0}'.format(server2.Variables.SSL_Port, ts.Variables.ssl_port)
 )
 ts.Disk.remap_config.AddLine(
-    'map / http://127.0.0.1:8888'
+    'map / http://127.0.0.1:{0}'.format(Test.Variables.upstream_port)
 )
 
 ts.Disk.ssl_multicert_config.AddLine(
@@ -144,7 +146,7 @@ tr = Test.AddTestRun()
 tr.TimeOut = 5
 tr.Setup.Copy('server4.sh')
 tr.Setup.Copy('case4.sh')
-tr.Processes.Default.Command = 'sh ./case4.sh {0}'.format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = 'sh ./case4.sh {0} {1}'.format(ts.Variables.ssl_port, Test.Variables.upstream_port)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = Testers.ExcludesExpression("content-length:", "Response should not include content length")
 # Transfer encoding to origin, but no content-length