Update to Proxy Verifier version v2.3.0

tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py

@@ -138,8 +138,8 @@ def setupOriginServer(self):
             "Header write for key 2 failed",
             "Verify that writing the second response failed.")
 
-        # ATS should close the connection before any body gets through.
-        # "abc" is the body sent for each of these chunked cases.
+        # ATS should close the connection before any body gets through. "abc"
+        # is the body sent by the client for each of these chunked cases.
         self.server.Streams.stdout += Testers.ExcludesExpression(
             "abc",
             "Verify that the body never got through.")
@@ -181,16 +181,16 @@ def runChunkedTraffic(self):
         # code from the verifier client.
         tr.Processes.Default.ReturnCode = 1
         tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
-            "Failed HTTP/1 transaction with key=3",
+            "Failed HTTP/1 transaction with key: 3",
             "Verify that ATS closed the third transaction.")
         tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
-            "Failed HTTP/1 transaction with key=4",
+            "Failed HTTP/1 transaction with key: 4",
             "Verify that ATS closed the fourth transaction.")
 
-        # ATS should close the connection before any body gets through.
-        # "abc" is the body sent for each of these chunked cases.
+        # ATS should close the connection before any body gets through. "def"
+        # is the body sent by the server for each of these chunked cases.
         tr.Processes.Default.Streams.stdout += Testers.ExcludesExpression(
-            "abc",
+            "def",
             "Verify that the body never got through.")
 
     def run(self):

tests/gold_tests/chunked_encoding/gold/verifier_client_chunked.gold

@@ -1,13 +1,15 @@
 ``
-- "connection": "keep-alive"
+connection: keep-alive
 ``
-- "Connection": "close"
+Connection: close
 ``
-``content: 0000000 0000001 0000002 0000003 
+``content:
+0000000 0000001 0000002 0000003 
 ``
-- "connection": "keep-alive"
+connection: keep-alive
 ``
-- "Connection": "close"
+Connection: close
 ``
-``content: 0000000 0000001 0000002 0000003 
+``content:
+0000000 0000001 0000002 0000003 
 ``

tests/gold_tests/chunked_encoding/replays/malformed_chunked_header.replay.yaml

@@ -83,7 +83,7 @@ sessions:
         transfer: plain
         encoding: uri
         # Chunk header sizes are in hex, so a size of `z` is malformed.
-        data: z%0D%0Aabc%0D%0A0%0D%0A%0D%0A
+        data: z%0D%0Adef%0D%0A0%0D%0A%0D%0A
 
 - transactions:
   - client-request:
@@ -106,4 +106,4 @@ sessions:
         transfer: plain
         encoding: uri
         # Super large chunk header, larger than will fit in an int.
-        data: 111111113%0D%0Aabc%0D%0A0%0D%0A%0D%0A
+        data: 111111113%0D%0Adef%0D%0A0%0D%0A%0D%0A

tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py

@@ -55,46 +55,46 @@ def setupServers(self):
 
         # The origin should never receive "X-Multiplexer: copy"
         self.server_origin.Streams.All += Testers.ExcludesExpression(
-            '"X-Multiplexer": "copy"',
+            'X-Multiplexer: copy',
             'Verify the original server target never receives a "copy".')
 
         # Nor should the multiplexed hosts receive an "original" X-Multiplexer value.
         self.server_http.Streams.All += Testers.ExcludesExpression(
-            '"X-Multiplexer": "original"',
+            'X-Multiplexer: original',
             'Verify the HTTP multiplexed host does not receive an "original".')
         self.server_https.Streams.All += Testers.ExcludesExpression(
-            '"X-Multiplexer": "original"',
+            'X-Multiplexer: original',
             'Verify the HTTPS multiplexed host does not receive an "original".')
 
         # In addition, the original server should always receive the POST and
         # PUT requests.
         self.server_origin.Streams.All += Testers.ContainsExpression(
-            '"uuid": "POST"',
+            'uuid: POST',
             "Verify the client's original target received the POST transaction.")
         self.server_origin.Streams.All += Testers.ContainsExpression(
-            '"uuid": "PUT"',
+            'uuid: PUT',
             "Verify the client's original target received the PUT transaction.")
 
         # Under all configurations, the GET request should be multiplexed.
         self.server_origin.Streams.All += Testers.ContainsExpression(
-            '"X-Multiplexer": "original"',
+            'X-Multiplexer: original',
             'Verify the client\'s original target received the "original" request.')
         self.server_origin.Streams.All += Testers.ContainsExpression(
-            '"uuid": "GET"',
+            'uuid: GET',
             "Verify the client's original target received the GET request.")
 
         self.server_http.Streams.All += Testers.ContainsExpression(
-            '"X-Multiplexer": "copy"',
+            'X-Multiplexer: copy',
             'Verify the HTTP server received a "copy" of the request.')
         self.server_http.Streams.All += Testers.ContainsExpression(
-            '"uuid": "GET"',
+            'uuid: GET',
             "Verify the HTTP server received the GET request.")
 
         self.server_https.Streams.All += Testers.ContainsExpression(
-            '"X-Multiplexer": "copy"',
+            'X-Multiplexer: copy',
             'Verify the HTTPS server received a "copy" of the request.')
         self.server_https.Streams.All += Testers.ContainsExpression(
-            '"uuid": "GET"',
+            'uuid: GET',
             "Verify the HTTPS server received the GET request.")
 
         # Verify that the HTTPS server receives a TLS connection.
@@ -168,18 +168,18 @@ def setupServers(self):
         # Both of the multiplexed hosts should receive the POST because skip_post
         # is disabled.
         self.server_http.Streams.All += Testers.ContainsExpression(
-            '"uuid": "POST"',
+            'uuid: POST',
             "Verify the HTTP server received the POST request.")
         self.server_https.Streams.All += Testers.ContainsExpression(
-            '"uuid": "POST"',
+            'uuid: POST',
             "Verify the HTTPS server received the POST request.")
 
         # Same with PUT
         self.server_http.Streams.All += Testers.ContainsExpression(
-            '"uuid": "PUT"',
+            'uuid: PUT',
             "Verify the HTTP server received the PUT request.")
         self.server_https.Streams.All += Testers.ContainsExpression(
-            '"uuid": "PUT"',
+            'uuid: PUT',
             "Verify the HTTPS server received the PUT request.")
 
 
@@ -203,18 +203,18 @@ def setupServers(self):
         # Neither of the multiplexed hosts should receive the POST because skip_post
         # is enabled.
         self.server_http.Streams.All += Testers.ExcludesExpression(
-            '"uuid": "POST"',
+            'uuid: POST',
             "Verify the HTTP server did not receive the POST request.")
         self.server_https.Streams.All += Testers.ExcludesExpression(
-            '"uuid": "POST"',
+            'uuid: POST',
             "Verify the HTTPS server did not receive the POST request.")
 
         # Same with PUT.
         self.server_http.Streams.All += Testers.ExcludesExpression(
-            '"uuid": "PUT"',
+            'uuid: PUT',
             "Verify the HTTP server did not receive the PUT request.")
         self.server_https.Streams.All += Testers.ExcludesExpression(
-            '"uuid": "PUT"',
+            'uuid: PUT',
             "Verify the HTTPS server did not receive the PUT request.")
 
 

tests/prepare_proxy_verifier.sh

@@ -27,7 +27,7 @@ pv_dir="${pv_name}-${pv_version}"
 pv_tar_filename="${pv_dir}.tar.gz"
 pv_tar="${pv_top_dir}/${pv_tar_filename}"
 pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}"
-expected_sha1="d9a02aedae76d4952784c67716fddba0df274a28"
+expected_sha1="5c7b5a0e105321cc1627fcdc80b2bf16b44033af"
 pv_client="${bin_dir}/verifier-client"
 pv_server="${bin_dir}/verifier-server"
 TAR=${TAR:-tar}

tests/proxy-verifier-version.txt

@@ -1 +1 @@
-v2.2.2
+v2.3.0