From f190c4f09d5dc7fcbfc2a4f10bd29c864c9be89e Mon Sep 17 00:00:00 2001
From: Maxb <bittmanmax@gmail.com>
Date: Wed, 26 Mar 2025 16:03:37 -0700
Subject: [PATCH] Disable kcp reconnect test
KCP reconnection is currently failing for reasons that are different
than the work in the current MR scope. We've re-enabled reconnect
integration testing in this MR somewhat inadvertently, so we can
specifically disable this testing combination and work on it elsewhere.
---
scripts/integration-test.sh | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh
index 8348113..8280c24 100755
--- a/scripts/integration-test.sh
+++ b/scripts/integration-test.sh
@@ -68,20 +68,22 @@ counter=0
max_reconnect_retry=10
if [[ "$LIVE_TEST" == "0" ]]; then
- echo "Testing reconnect" | tee -a $logfile
-
- # We can't just restart the obfsvpn servers because of some very odd way that key material is being generated so we go down and up instead 🤷
- docker compose -p "$mode" --env-file $env_file down obfsvpn-1 obfsvpn-2
- docker compose -p "$mode" --env-file $env_file up -d obfsvpn-1 obfsvpn-2
-
- until docker compose -p "$mode" --env-file $env_file exec client ping -c 3 -I tun0 8.8.8.8
- do
- ((counter++))
- [[ counter -eq $max_reconnect_retry ]] && echo "Failed!" | tee -a $logfile && exit 1
- echo "Pinging in client container with config $(cat ${env_file} | grep KCP) and $(cat ${env_file} | grep HOP_PT) after reconnect failed. Trying again. Try #$counter" | tee -a $logfile
- sleep 10
- done
-
+ # KCP reconnect is currently broken, disable the kcp+reconnect integration test for now
+ if [[ "$mode" != "kcp" && "$mode" != "hop-kcp" ]]; then
+ echo "Testing reconnect" | tee -a $logfile
+
+ # We can't just restart the obfsvpn servers because of some very odd way that key material is being generated so we go down and up instead 🤷
+ docker compose -p "$mode" --env-file $env_file down obfsvpn-1 obfsvpn-2
+ docker compose -p "$mode" --env-file $env_file up -d obfsvpn-1 obfsvpn-2
+
+ until docker compose -p "$mode" --env-file $env_file exec client ping -c 3 -I tun0 8.8.8.8
+ do
+ ((counter++))
+ [[ counter -eq $max_reconnect_retry ]] && echo "Failed!" | tee -a $logfile && exit 1
+ echo "Pinging in client container with config $(cat ${env_file} | grep KCP) and $(cat ${env_file} | grep HOP_PT) after reconnect failed. Trying again. Try #$counter" | tee -a $logfile
+ sleep 10
+ done
+ fi
fi
docker compose -p "$mode" --env-file $env_file exec client ndt7-client -quiet | tee -a $logfile
--
GitLab