trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From masa...@apache.org
Subject [trafficserver] branch master updated: Run httpbin as an origin server of AuTest
Date Tue, 14 Apr 2020 23:49:07 GMT
This is an automated email from the ASF dual-hosted git repository.

masaori 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 d3312c6  Run httpbin as an origin server of AuTest
d3312c6 is described below

commit d3312c68d15e46b9eab59014b21027180e17de30
Author: Masaori Koshiba <masaori@apache.org>
AuthorDate: Tue Apr 14 13:24:28 2020 +0900

    Run httpbin as an origin server of AuTest
---
 tests/gold_tests/logging/new_log_flds.test.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/gold_tests/logging/new_log_flds.test.py b/tests/gold_tests/logging/new_log_flds.test.py
index f6198af..a48c8aa 100644
--- a/tests/gold_tests/logging/new_log_flds.test.py
+++ b/tests/gold_tests/logging/new_log_flds.test.py
@@ -26,6 +26,14 @@ Test.SkipUnless(
     Condition.HasCurlFeature('http2')
 )
 
+# ----
+# Setup httpbin Origin Server
+# ----
+httpbin = Test.MakeHttpBinServer("httpbin")
+
+# ----
+# Setup ATS
+# ----
 ts = Test.MakeATSProcess("ts", enable_tls=True)
 
 ts.addSSLfile("../remap/ssl/server.pem")
@@ -38,15 +46,15 @@ ts.Disk.records_config.update({
 })
 
 ts.Disk.remap_config.AddLine(
-    'map http://127.0.0.1:{0} http://httpbin.org/ip'.format(ts.Variables.port)
+    'map http://127.0.0.1:{0} http://127.0.0.1:{1}/ip'.format(ts.Variables.port, httpbin.Variables.Port)
 )
 
 ts.Disk.remap_config.AddLine(
-    'map https://127.0.0.1:{0} https://httpbin.org/ip'.format(ts.Variables.ssl_port)
+    'map https://127.0.0.1:{0} http://127.0.0.1:{1}/ip'.format(ts.Variables.ssl_port, httpbin.Variables.Port)
 )
 
 ts.Disk.remap_config.AddLine(
-    'map https://reallyreallyreallyreallylong.com https://httpbin.org/ip'.format(ts.Variables.ssl_port)
+    'map https://reallyreallyreallyreallylong.com http://127.0.0.1:{1}/ip'.format(ts.Variables.ssl_port,
httpbin.Variables.Port)
 )
 
 ts.Disk.ssl_multicert_config.AddLine(
@@ -68,6 +76,7 @@ logging:
 tr = Test.AddTestRun()
 # Delay on readiness of ssl port
 tr.Processes.Default.StartBefore(Test.Processes.ts)
+tr.Processes.Default.StartBefore(httpbin, ready=When.PortOpen(httpbin.Variables.Port))
 #
 tr.Processes.Default.Command = 'curl "http://127.0.0.1:{0}" --verbose'.format(
     ts.Variables.port)


Mime
View raw message