commit 80c5ade239bd9084ad0209a43b5ec726f9d59ab1456513fe8c16c87dc2090f39 from: Stefan Sperling date: Tue Mar 3 21:40:25 2026 UTC add test coverage for gotsys.conf being deleted and restored commit - 484fa7b085e0ecfb9f4631de83511af30a3f7bb96a5f9b114ba50a91f7576820 commit + 80c5ade239bd9084ad0209a43b5ec726f9d59ab1456513fe8c16c87dc2090f39 blob - 6b24a4de0ea1ad3eafd1886d5c258db415d9680854309dca7d9334093ce488c6 blob + 2954ae3d2686f64264ae771c3611a1bf8f3fd3f38cefe69239f9e8e1e36332d9 --- regress/gotsysd/test_gotsysd.sh +++ regress/gotsysd/test_gotsysd.sh @@ -2536,6 +2536,65 @@ EOF return 1 fi + (cd $testroot/wt && got rm gotsys.conf > /dev/null) + (cd $testroot/wt && got commit -m "attempt to delete gotsys.conf" \ + >/dev/null) + local commit_id=`git_show_head $testroot/${GOTSYS_REPO}` + + got send -q -i ${GOTSYSD_SSH_KEY} -r ${testroot}/${GOTSYS_REPO} \ + > $testroot/stdout 2> $testroot/stderr + ret=$? + if [ $ret -eq 0 ]; then + echo "got send succeeded unexpectedly" >&2 + test_done "$testroot" 1 + return 1 + fi + + cat > ${testroot}/stderr.expected < /dev/null) + (cd $testroot/wt && got backout $commit_id > /dev/null) + (cd $testroot/wt && got commit -m "restore gotsys.conf" >/dev/null) + local commit_id=`git_show_head $testroot/${GOTSYS_REPO}` + + got send -q -i ${GOTSYSD_SSH_KEY} -r ${testroot}/${GOTSYS_REPO} + ret=$? + if [ $ret -ne 0 ]; then + echo "got send failed unexpectedly" >&2 + test_done "$testroot" 1 + return 1 + fi + + # Wait for gotsysd to apply the new configuration. + echo "$commit_id" > $testroot/stdout.expected + for i in 1 2 3 4 5; do + sleep 1 + ssh -i ${GOTSYSD_SSH_KEY} root@${VMIP} \ + cat /var/db/gotsysd/commit > $testroot/stdout + if cmp -s $testroot/stdout.expected $testroot/stdout; then + break; + fi + done + cmp -s $testroot/stdout.expected $testroot/stdout + ret=$? + if [ $ret -ne 0 ]; then + echo "gotsysd failed to apply configuration" >&2 + diff -u $testroot/stdout.expected $testroot/stdout + test_done "$testroot" "$ret" + return 1 + fi + test_done "$testroot" "$ret" }