Changeset a213967 in mod_gnutls

Timestamp:

Mar 31, 2015, 11:16:11 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

232fb60

Parents:

ed82a6a

Message:

Test suite: Filter "Server" header when checking output

Like "Date", this header is likely to change between builds or runs, e.g. because
of different Apache and GnuTLS versions between hosts.

Location:

test

Files:

• runtests (modified) (4 diffs)
• tests/21_TLS_reverse_proxy_wrong_cert/output (modified) (1 diff)

test/runtests

@@ -33 +33 @@
 }
 
-# Compare expected/actual outputs, filtering out the "Date" header
-# from actual output because it is expected to change. It must have
-# been manually excluded from the expected output.
+# 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.
 #
 # Parameters:
@@ -41 +42 @@
 # $2: path to actual output
 # $3: additional options for diff (optional)
-function diff_output_filter_date()
+function diff_output_filter_headers()
 {
     expected="$1"
     actual="$2"
     diff $3 -u "${expected}" <( cat "${actual}" | \
-        grep -v -P '^Date:\s.*GMT\s?$' | tail -n "$(wc -l < ${expected})" )
+        grep -v -P '^Date:\s.*GMT\s?$' | \
+        grep -v -P '^Server:\sApache'  | \
+        tail -n "$(wc -l < ${expected})" )
 }
 
@@ -54 +57 @@
     if [ -e output ]; then
         printf "\ngnutls-cli outputs:\n"
-        diff_output_filter_date "output" "$output" || true
+        diff_output_filter_headers "output" "$output" || true
     fi
     printf "\nApache error logs:\n"
@@ -131 +134 @@
 
     if [ -e output ] ; then
-        diff_output_filter_date "output" "$output" "-q"
+        diff_output_filter_headers "output" "$output" "-q"
     fi
     /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k stop || [ -e fail.server ]

test/tests/21_TLS_reverse_proxy_wrong_cert/output

@@ -1 +1 @@
 HTTP/1.1 502 Proxy Error
-Server: Apache/2.4.10 (Ubuntu) mod_gnutls/0.6 GnuTLS/3.2.16
 Content-Length: 407
 Connection: close