From 45a8428a30c2aebeb5163913c8167b318ff65c81 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Sat, 31 Dec 2022 07:34:10 +0100
Subject: tests: rework common code

Turn try-ssh.sh script into a shell function library.
---
 tests/dist-upgrades.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'tests/dist-upgrades.sh')

diff --git a/tests/dist-upgrades.sh b/tests/dist-upgrades.sh
index e531f1c..b4d61dd 100755
--- a/tests/dist-upgrades.sh
+++ b/tests/dist-upgrades.sh
@@ -6,6 +6,8 @@
 
 set -x
 
+. "$(dirname "$0")/test_common.sh"
+
 cleanup() {
 	rm -f ssh_id ssh_id.pub upgrade
 }
@@ -31,18 +33,22 @@ poweroff
 EOF
 
 chmod +x upgrade
-ssh-keygen -f ssh_id -N ''
+SSH_KEYPATH=ssh_id
+ssh-keygen -f "$SSH_KEYPATH" -N ''
 
-debvm-create -k ssh_id.pub -r jessie -z 3 -- --customize-hook="copy-in upgrade /usr/local/bin"
+debvm-create -k "$SSH_KEYPATH.pub" -r jessie -z 3 -- --customize-hook="copy-in upgrade /usr/local/bin"
 
+SSH_PORT=2222
 for RELEASE in stretch buster bullseye bookworm sid; do
-	timeout 15m debvm-run -s 2222 &
-	SSHOPT="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-	test "$RELEASE" = stretch && SSHOPT="${SSHOPT} -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-	tests/try-ssh.sh "$SSHOPT -i ssh_id -p 2222 root@localhost" "upgrade $RELEASE"
+	timeout 15m debvm-run -s "$SSH_PORT" &
+	set -- localhost
+	test "$RELEASE" = stretch && set -- -o PubkeyAcceptedKeyTypes=+ssh-rsa "$@"
+	wait_ssh "$@"
+	run_ssh "$@" "upgrade $RELEASE"
 	wait
 done
 
-timeout 5m debvm-run -s 2222 &
-tests/try-ssh.sh "-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ssh_id -p 2222 root@localhost" poweroff
+timeout 5m debvm-run -s "$SSH_PORT" &
+wait_ssh localhost
+run_ssh localhost poweroff
 wait
-- 
cgit v1.2.3