Changeset 20a20df in mod_gnutls for test

Timestamp:

Nov 1, 2019, 5:21:04 PM (4 months ago)

Author:

Krista Karppinen <krista.celestia@…>

Branches:

master

Children:

c6987c6

Parents:

a55742a

git-author:

Krista Karppinen <krista.celestia@…> (11/01/19 17:07:20)

git-committer:

Krista Karppinen <krista.celestia@…> (11/01/19 17:21:04)

Message:

Test suite: ignore "Content-Length" header

Do not check the returned "Content-Length" header value when running the
tests, as long as it's valid. This will allow for more flexibility in
matching the content in the future.

Location:

test

Files:

• runtests (modified) (2 diffs)
• tests/00_basic/output (modified) (1 diff)
• tests/01_serverwide_priorities/output (modified) (1 diff)
• tests/03_cachetimeout_in_vhost/output (modified) (1 diff)
• tests/04_basic_nosni/output (modified) (1 diff)
• tests/06_verify_sni_a/output (modified) (1 diff)
• tests/07_verify_sni_b/output (modified) (1 diff)
• tests/08_verify_no_sni_fallback_to_first_vhost/output (modified) (1 diff)
• tests/10_basic_client_verification/output (modified) (1 diff)
• tests/14_resume_session/output (modified) (1 diff)
• tests/15_basic_msva/output (modified) (1 diff)
• tests/19_TLS_reverse_proxy/output (modified) (1 diff)
• tests/20_TLS_reverse_proxy_client_auth/output (modified) (1 diff)
• tests/21_TLS_reverse_proxy_wrong_cert/output (modified) (1 diff)
• tests/22_TLS_reverse_proxy_crl_revoke/output (modified) (1 diff)
• tests/23_TLS_reverse_proxy_mismatched_priorities/output (modified) (1 diff)
• tests/24_pkcs11_cert/output (modified) (1 diff)
• tests/27_OCSP_server/output (modified) (1 diff)
• tests/29_force_handshake_vhost/output (modified) (1 diff)
• tests/30_ip_based_vhosts/output (modified) (1 diff)
• tests/31_vhost_SNI_serveralias_match/output (modified) (1 diff)
• tests/32_vhost_SNI_serveralias_mismatch/output (modified) (1 diff)
• tests/33_vhost_SNI_serveralias_missinghost/output (modified) (1 diff)
• tests/34_TLS_reverse_proxy_h2/output (modified) (1 diff)

test/runtests

@@ -50 +50 @@
 # Compare expected/actual outputs, filtering out headers from actual
 # output that are expected to change between runs or builds (currently
-# "Date" and "Server"). The headers must be excluded in the expected
-# output.
+# "Date", "Server" and "Content-Length"). The headers must be excluded
+# in the expected output.
 #
 # Parameters:
@@ -64 +64 @@
         grep -v -P '^Date:\s.*GMT\s?$' | \
         grep -v -P '^Server:\sApache'  | \
+        grep -v -P '^Content-Length:\s\d+\s?$' | \
         tail -n "$(wc -l < ${expected})" )
 }

test/tests/00_basic/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/01_serverwide_priorities/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/03_cachetimeout_in_vhost/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/04_basic_nosni/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/06_verify_sni_a/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/07_verify_sni_b/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/08_verify_no_sni_fallback_to_first_vhost/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/10_basic_client_verification/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/14_resume_session/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/15_basic_msva/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/19_TLS_reverse_proxy/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Content-Type: text/plain
 Connection: close

test/tests/20_TLS_reverse_proxy_client_auth/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Content-Type: text/plain
 Connection: close

test/tests/21_TLS_reverse_proxy_wrong_cert/output

@@ -1 +1 @@
 HTTP/1.1 502 Proxy Error
-Content-Length: 341
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/22_TLS_reverse_proxy_crl_revoke/output

@@ -1 +1 @@
 HTTP/1.1 502 Proxy Error
-Content-Length: 341
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/23_TLS_reverse_proxy_mismatched_priorities/output

@@ -1 +1 @@
 HTTP/1.1 502 Proxy Error
-Content-Length: 341
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/24_pkcs11_cert/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/27_OCSP_server/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/29_force_handshake_vhost/output

@@ -1 +1 @@
 HTTP/1.1 421 Misdirected Request
-Content-Length: 322
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/30_ip_based_vhosts/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/31_vhost_SNI_serveralias_match/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Connection: close
 Content-Type: text/plain

test/tests/32_vhost_SNI_serveralias_mismatch/output

@@ -1 +1 @@
 HTTP/1.1 421 Misdirected Request
-Content-Length: 322
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/33_vhost_SNI_serveralias_missinghost/output

@@ -1 +1 @@
 HTTP/1.1 421 Misdirected Request
-Content-Length: 322
 Connection: close
 Content-Type: text/html; charset=iso-8859-1

test/tests/34_TLS_reverse_proxy_h2/output

@@ -1 +1 @@
 Accept-Ranges: bytes
-Content-Length: 5
 Content-Type: text/plain
 Connection: close