From f7be1241bce9ce4960dfcf708cc0a94c02ff55e0 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Thu, 13 May 2021 21:34:49 +0200 Subject: Adapt autopkgtest output to 2.5 OpenVPN 2.5 slightly changed the output of some steps due to the switch from iproute2 to the newer Netlink based interface. This was not noticed because the autopkgtest of OpenVPN is not run in debci infrastructure (machine-isolation not supported) This patch was imported from Ubuntu, thanks a lot! Partially fixes Bug#983662, but there is more work to do --- debian/tests/server-setup-with-ca | 4 ++-- debian/tests/server-setup-with-static-key | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/tests/server-setup-with-ca b/debian/tests/server-setup-with-ca index 58df2e9..08a879e 100755 --- a/debian/tests/server-setup-with-ca +++ b/debian/tests/server-setup-with-ca @@ -75,10 +75,10 @@ info "Check if Diffie-Hellman was initialized" cat $LOG_FILE | grep 'Diffie-Hellman initialized' info "Check if the $DEVICE is linked" -cat $LOG_FILE | grep "/sbin/ip link set dev $DEVICE up" +cat $LOG_FILE | grep "net_iface_up: set $DEVICE up" info "Check if the network route was correctly configured" -cat $LOG_FILE | grep "/sbin/ip route add $IP_NETWORK/24" +cat $LOG_FILE | grep "net_route_v4_add: $IP_NETWORK/24 via" info "Check if the Initialization Sequence completed" cat $LOG_FILE | grep 'Initialization Sequence Completed' diff --git a/debian/tests/server-setup-with-static-key b/debian/tests/server-setup-with-static-key index 9ddaecd..8c0addf 100755 --- a/debian/tests/server-setup-with-static-key +++ b/debian/tests/server-setup-with-static-key @@ -50,10 +50,10 @@ info "Check if the $STATIC_KEY is used by OpenVPN" cat $LOG_FILE | grep "shared_secret_file = '$CONFIG_DIR/$STATIC_KEY'" info "Check if the $DEVICE is linked" -cat $LOG_FILE | grep "/sbin/ip link set dev $DEVICE up" +cat $LOG_FILE | grep "net_iface_up: set $DEVICE up" info "Check if the specified IP addresses were configured" -cat $LOG_FILE | grep "/sbin/ip addr add dev tun0 local $IP_SERVER peer $IP_CLIENT" +cat $LOG_FILE | grep "net_addr_ptp_v4_add: $IP_SERVER peer $IP_CLIENT dev tun0" # Clean up: kill tha OpenVPN process, remove the $DEVICE created and $STATIC_KEY cleanup() { -- cgit v1.2.3