diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 00e8d72b..7ba6f82c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,10 +43,11 @@ jobs: - name: Remove zkg installation # Rule out confusion between test environment and pre-existing zkg: run: | - rm $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1 - rm -r $ZEEKROOT/etc/zkg - rm -r $ZEEKROOT/lib/zeek/python/zeekpkg - rm -r $ZEEKROOT/var/lib/zkg + rm -f $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1 + rm -f -r $ZEEKROOT/etc/zkg + rm -f -r $ZEEKROOT/lib/zeek/python/zeekpkg + rm -f -r $ZEEKROOT/bin/zkg + rm -f -r $ZEEKROOT/var/lib/zkg - uses: actions/checkout@v4 - name: Install uv diff --git a/testing/tests/bundle-unsatisfied-dependency b/testing/tests/bundle-unsatisfied-dependency index efbed3e8..05692c67 100644 --- a/testing/tests/bundle-unsatisfied-dependency +++ b/testing/tests/bundle-unsatisfied-dependency @@ -8,7 +8,7 @@ # @TEST-EXEC: zkg unbundle bundle.tar >> output # @TEST-EXEC: zkg list >> output # @TEST-EXEC: btest-diff output -# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g" | sed -r "s/\(.\..\..\)/(X.X.X)/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr +# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/\([0-9]+\.[0-9]+\.[0-9]+\)/(X.X.X)/g" | sed -r "s/[0-9]{2}/XX/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr # @TEST-EXEC: btest-diff package.log # diff --git a/testing/tests/concurrent-state-lock b/testing/tests/concurrent-state-lock deleted file mode 100644 index cde4667b..00000000 --- a/testing/tests/concurrent-state-lock +++ /dev/null @@ -1,18 +0,0 @@ -# @TEST-DOC: Concurrent zkg invocations must not race on shared state. -# -# @TEST-EXEC: bash %INPUT -# @TEST-EXEC: btest-bg-wait 30 -# -# @TEST-EXEC: test ! -s r1/.stderr -# @TEST-EXEC: test ! -s r2/.stderr - -# `btest-bg-run` changes the working directory, so `zkg list` needs an explicit cd to find the test state. -# -# This test assumes `zkg list` mutates state, without that the race may not trigger. -testdir=$(pwd) -cat > run-zkg-list <