Changeset baa0056 in mod_gnutls

Timestamp:

Jan 8, 2020, 3:39:14 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

0f52d48

Parents:

9a48691

Message:

Test 30_ip_based_vhosts: Move to prepare_env hook

Location:

test

Files:

• test-30_ip_based_vhosts.bash (modified) (1 diff)
• tests/30_ip_based_vhosts/hooks.py (added)
• tests/Makefile.am (modified) (1 diff)

test/test-30_ip_based_vhosts.bash

@@ -1 +1 @@
 #!/bin/bash
-
-# Parse TEST_IP into an array
-declare -a addrs=(${TEST_IP})
-if [ ${#addrs[@]} -lt 2 ]; then
-    echo "This test needs two or more IP addresses in TEST_IP," \
-         "check ./configure options!"
-    exit 77
-fi
-
-# The two virtual hosts have different IPs, so we can check if
-# selection without SNI works correctly. The request will go to the
-# second one.
-export VHOST1_IP="${addrs[0]}"
-export VHOST2_IP="${addrs[1]}"
-
-# gnutls-cli expects IPv6 addresses without enclosing brackets, remove
-# them
-TARGET_IP="${VHOST2_IP#\[}"
-TARGET_IP="${TARGET_IP%\]}"
-export TARGET_IP
-
 . ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 30

test/tests/Makefile.am

@@ -30 +30 @@
         28_HTTP2_support/apache.conf 28_HTTP2_support/hooks.py \
         29_force_handshake_vhost/apache.conf 29_force_handshake_vhost/test.yml \
-        30_ip_based_vhosts/apache.conf 30_ip_based_vhosts/test.yml \
+        30_ip_based_vhosts/apache.conf 30_ip_based_vhosts/hooks.py 30_ip_based_vhosts/test.yml \
         31_vhost_SNI_serveralias_match/apache.conf 31_vhost_SNI_serveralias_match/test.yml \
         32_vhost_SNI_serveralias_mismatch/apache.conf 32_vhost_SNI_serveralias_mismatch/test.yml \