apache · dragon512 · Apr 27, 2018 · Jan 25, 2018
diff --git a/tests/gold_tests/autest-site/cli_tools.test.ext b/tests/gold_tests/autest-site/cli_tools.test.ext
@@ -0,0 +1,55 @@
+'''
+Tools to help with TestRun commands
+'''
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+# allows the same command to be repeatedly run in parallel.
+#
+# example usage:
+# curlcmd = 'curl -vs -k https:127.0.0.1:{port}'.format(port = ts.Variables.port)
+#
+# tr = Test.AddTestRun()
+# ps = tr.SpawnCommands(cmdstr=cmdstr, count=25)
+# tr.Processes.Default.StartBefore(ts)
+# ts.StartAfter(*ps)
+# tr.StillRunningAfter = ts
+#
+# Note that by default, the Default Process is created in this function. 
+
+def spawn_commands(self, cmdstr, count, retcode = 0, use_default=True):
+    ret=[] 
+
+    if use_default:
+        count = int(count) - 1  
+    for cnt in range(0,count):  
+        ret.append(  
+            self.Processes.Process(  
+                name="cmdline-{num}".format(num=cnt),  
+                cmdstr = cmdstr,  
+                returncode = retcode
+                )  
+            )
+    if use_default:
+        self.Processes.Default.Command = cmdstr
+        self.Processes.Default.ReturnCode = retcode
+        self.Processes.Default.StartBefore(
+            *ret
+        )
+    return ret 
+
+ExtendTestRun(spawn_commands, name="SpawnCommands")
diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py
@@ -17,13 +17,11 @@
 #  limitations under the License.
 
 import os
-from random import randint
 Test.Summary = '''
-Test transactions and sessions, making sure they open and close in the proper order.
+Test transactions and sessions, making sure two continuations catch the same number of hooks.
 '''
-# need Apache Benchmark. For RHEL7, this is httpd-tools
 Test.SkipUnless(
-    Condition.HasProgram("ab", "apache benchmark (httpd-tools) needs to be installed on system for this test to work")
+    Condition.HasProgram("curl", "Curl needs to be installed on system for this test to work")
 )
 Test.ContinueOnFail = True
 # Define default ATS
@@ -50,15 +48,22 @@
     'map http://double.test:{0} http://127.0.0.1:{1}'.format(ts.Variables.port, server.Variables.Port)
 )
 
-numberOfRequests = randint(1000, 1500)
+cmd = 'curl -vs http://127.0.0.1:{0}'.format(ts.Variables.port)
+numberOfRequests = 25
 
-# Make a *ton* of calls to the proxy!
 tr = Test.AddTestRun()
-tr.Processes.Default.Command = 'ab -n {0} -c 10 http://127.0.0.1:{1}/;sleep 5'.format(numberOfRequests, ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-# time delay as proxy.config.http.wait_for_cache could be broken
-tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
-tr.Processes.Default.StartBefore(ts, ready=When.PortOpen(ts.Variables.port))
+
+# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. 
+ps = tr.SpawnCommands(cmdstr=cmd,  count=numberOfRequests)
+tr.Processes.Default.Env = ts.Env
+
+# Execution order is: ts/server, ps(curl cmds), Default Process.
+tr.Processes.Default.StartBefore(
+    server, ready=When.PortOpen(server.Variables.Port))
+# Adds a delay once the ts port is ready. This is because we cannot test the ts state.
+tr.Processes.Default.StartBefore(ts, ready=10)
+ts.StartAfter(*ps)
+server.StartAfter(*ps)
 tr.StillRunningAfter = ts
 
 comparator_command = '''
@@ -71,14 +76,9 @@
 
 records = ts.Disk.File(os.path.join(ts.Variables.RUNTIMEDIR, "records.snap"))
 
-
-def file_is_ready():
-    return os.path.exists(records.AbsPath)
-
-
 # number of sessions/transactions opened and closed are equal
 tr = Test.AddTestRun()
-tr.DelayStart=10 
+tr.DelayStart = 10 # wait for stats to be updated
 tr.Processes.Default.Command = comparator_command.format('ssn')
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Env = ts.Env

diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py
@@ -0,0 +1,150 @@
+'''
+'''
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import os
+Test.Summary = '''
+Test transactions and sessions for http2, making sure the two continuations catch the same number of hooks.
+'''
+Test.SkipUnless(
+    Condition.HasProgram("curl", "Curl needs to be installed on system for this test to work"),
+    Condition.HasCurlFeature('http2')
+)
+Test.ContinueOnFail = True
+# Define default ATS
+ts = Test.MakeATSProcess("ts", select_ports=False, command="traffic_manager")
+server = Test.MakeOriginServer("server")
+
+Test.testName = ""
+request_header = {"headers": "GET / HTTP/1.1\r\nHost: double_h2.test\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
+# expected response from the origin server
+response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
+                   "timestamp": "1469733493.993", "body": ""}
+
+# add response to the server dictionary
+server.addResponse("sessionfile.log", request_header, response_header)
+
+# add ssl materials like key, certificates for the server
+ts.addSSLfile("ssl/server.pem")
+ts.addSSLfile("ssl/server.key")
+
+# add port and remap rule
+ts.Variables.ssl_port = 4443
+ts.Disk.remap_config.AddLine(
+    'map http://double_h2.test:{0} http://127.0.0.1:{1}'.format(ts.Variables.port, server.Variables.Port)
+)
+
+ts.Disk.ssl_multicert_config.AddLine(
+    'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key'
+)
+
+ts.Disk.records_config.update({
+    'proxy.config.diags.debug.enabled': 1,
+    'proxy.config.diags.debug.tags': 'continuations_verify.*',
+    'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir),
+    'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir),
+    'proxy.config.http.cache.http': 0,  # disable cache to simply the test.
+    'proxy.config.cache.enable_read_while_writer': 0,
+     # enable ssl port
+    'proxy.config.http.server_ports': '{0} {1}:proto=http2;http:ssl'.format(ts.Variables.port, ts.Variables.ssl_port),
+    'proxy.config.ssl.client.verify.server':  0,
+    'proxy.config.ssl.server.cipher_suite': 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RC4-SHA:RC4-MD5:AES128-SHA:AES256-SHA:DES-CBC3-SHA!SRP:!DSS:!PSK:!aNULL:!eNULL:!SSLv2',
+    'proxy.config.http2.max_concurrent_streams_in': 65535
+})
+
+# add plugin to assist with test metrics
+Test.PreparePlugin(os.path.join(Test.Variables.AtsTestToolsDir,
+                                 'plugins', 'continuations_verify.cc'), ts)
+
+comparator_command = '''
+if test "`traffic_ctl metric get continuations_verify.{0}.close.1 | cut -d ' ' -f 2`" -eq "`traffic_ctl metric get continuations_verify.{0}.close.2 | cut -d ' ' -f 2`" ; then\
+     echo yes;\
+    else \
+    echo no; \
+    fi;
+    '''
+
+# curl with http2
+cmd = 'curl --http2 -k -vs https://127.0.0.1:{0}/'.format(ts.Variables.ssl_port)
+numberOfRequests = 25
+
+tr = Test.AddTestRun()
+
+# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. 
+ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests)
+tr.Processes.Default.Env = ts.Env
+
+# Execution order is: ts/server, ps(curl cmds), Default Process.
+tr.Processes.Default.StartBefore(
+    server, ready=When.PortOpen(server.Variables.Port))
+# Adds a delay once the ts port is ready. This is because we cannot test the ts state.
+tr.Processes.Default.StartBefore(ts, ready=10)
+ts.StartAfter(*ps)
+server.StartAfter(*ps)
+tr.StillRunningAfter = ts
+
+# Watch the records snapshot file.
+records = ts.Disk.File(os.path.join(ts.Variables.RUNTIMEDIR, "records.snap"))
+
+# number of sessions/transactions opened and closed are equal
+tr = Test.AddTestRun()
+tr.DelayStart = 10 # wait for stats to be updated
+tr.Processes.Default.Command = comparator_command.format('ssn')
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("yes", 'should verify contents')
+tr.StillRunningAfter = ts
+
+# for debugging session number
+ssn1 = tr.Processes.Process("session1", 'traffic_ctl metric get continuations_verify.ssn.close.1 > ssn1')
+ssn2 = tr.Processes.Process("session2", 'traffic_ctl metric get continuations_verify.ssn.close.2 > ssn2')
+ssn1.Env = ts.Env
+ssn2.Env = ts.Env
+tr.Processes.Default.StartBefore(ssn1)
+tr.Processes.Default.StartBefore(ssn2)
+
+tr = Test.AddTestRun()
+tr.Processes.Default.Command = comparator_command.format('txn')
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("yes", 'should verify contents')
+tr.StillRunningAfter = ts
+
+# for debugging transaction number
+txn1 = tr.Processes.Process("transaction1", 'traffic_ctl metric get continuations_verify.txn.close.1 > txn1')
+txn2 = tr.Processes.Process("transaction2", 'traffic_ctl metric get continuations_verify.txn.close.2 > txn2')
+txn1.Env = ts.Env
+txn2.Env = ts.Env
+tr.Processes.Default.StartBefore(txn1)
+tr.Processes.Default.StartBefore(txn2)
+
+# session count is positive,
+tr = Test.AddTestRun()
+tr.Processes.Default.Command = "traffic_ctl metric get continuations_verify.ssn.close.1"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression(" 0", 'should be nonzero')
+tr.StillRunningAfter = ts
+
+# and we receive the same number of transactions as we asked it to make
+tr = Test.AddTestRun()
+tr.Processes.Default.Command = "traffic_ctl metric get continuations_verify.txn.close.1"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.Processes.Default.Streams.stdout = Testers.ContainsExpression(
+    "continuations_verify.txn.close.1 {}".format(numberOfRequests), 'should be the number of transactions we made')
+tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/transaction/txn.test.py → ...old_tests/continuations/openclose.test.py b/tests/gold_tests/transaction/txn.test.py → ...old_tests/continuations/openclose.test.py
@@ -17,14 +17,12 @@
 #  limitations under the License.
 
 import os
-from random import randint
 Test.Summary = '''
 Test transactions and sessions, making sure they open and close in the proper order.
 '''
-# need Apache Benchmark. For RHEL7, this is httpd-tools
+
 Test.SkipUnless(
-    Condition.HasProgram(
-        "ab", "apache benchmark (httpd-tools) needs to be installed on system for this test to work")
+    Condition.HasProgram("curl", "Curl needs to be installed on system for this test to work")
 )
 
 # Define default ATS
@@ -33,7 +31,7 @@
 server = Test.MakeOriginServer("server")
 
 Test.testName = ""
-request_header = {"headers": "GET / HTTP/1.1\r\nHost: txn.test\r\n\r\n",
+request_header = {"headers": "GET / HTTP/1.1\r\nHost: oc.test\r\n\r\n",
                   "timestamp": "1469733493.993", "body": ""}
 # expected response from the origin server
 response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
@@ -52,27 +50,30 @@
 })
 
 ts.Disk.remap_config.AddLine(
-    'map http://txn.test:{0} http://127.0.0.1:{1}'.format(
+    'map http://oc.test:{0} http://127.0.0.1:{1}'.format(
         ts.Variables.port, server.Variables.Port)
 )
 
-numberOfRequests = randint(1000, 1500)
+cmd = 'curl -vs http://127.0.0.1:{0}'.format(ts.Variables.port)
+numberOfRequests = 25
 
-# Make a *ton* of calls to the proxy!
 tr = Test.AddTestRun()
-tr.Processes.Default.Command = 'ab -n {0} -c 10 -X 127.0.0.1:{1} http://txn.test/;sleep 5'.format(
-    numberOfRequests, ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-# time delay as proxy.config.http.wait_for_cache could be broken
+# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. 
+ps = tr.SpawnCommands(cmdstr=cmd,  count=numberOfRequests)
+tr.Processes.Default.Env = ts.Env
+
+# Execution order is: ts/server, ps(curl cmds), Default Process.
 tr.Processes.Default.StartBefore(
     server, ready=When.PortOpen(server.Variables.Port))
-tr.Processes.Default.StartBefore(ts, ready=When.PortOpen(ts.Variables.port))
+# Adds a delay once the ts port is ready. This is because we cannot test the ts state.
+tr.Processes.Default.StartBefore(ts, ready=10)
+ts.StartAfter(*ps)
+server.StartAfter(*ps)
 tr.StillRunningAfter = ts
 
 # Watch the records snapshot file.
 records = ts.Disk.File(os.path.join(ts.Variables.RUNTIMEDIR, "records.snap"))
 
-
 # Check our work on traffic_ctl
 # no errors happened,
 tr = Test.AddTestRun()
@@ -130,4 +131,4 @@
 tr.Processes.Default.Streams.stdout = Testers.ContainsExpression(
     "ssntxnorder_verify.txn.start {}".format(numberOfRequests), 'should be the number of transactions we made')
 tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
+tr.StillRunningAfter = server