From d94623e97db7383ec9c96f576b40904349bb6b27 Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Thu, 19 Oct 2023 14:17:22 +0800 Subject: [PATCH 1/2] Add more snapshot tests Test that crashes in #289 Signed-off-by: Andrew Innes Co-Authored-By: Axel Gembe --- contrib/windows/tests/tests.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/windows/tests/tests.py b/contrib/windows/tests/tests.py index 552295d9de9d..5c0155c0feb0 100644 --- a/contrib/windows/tests/tests.py +++ b/contrib/windows/tests/tests.py @@ -103,17 +103,17 @@ def log_dl(when): run_cmd(ctx.ZPOOL, ["export", "-a"]) pool.destroy = False # already exported - # ####################################################################### - # preTest("snapshot hang") - # with zpool_create(ctx, "testsn02", paths_to_unc(bf[:1])) as pool: - # log_dl("after testsn02 pool create") - - # allocate_file(pool.mount_path / "test01.file", 1 * Size.KIB) - # run_cmd(ctx.ZFS, ["snapshot", "testsn02@friday"]) - # allocate_file(pool.mount_path / "test02.file", 1 * Size.KIB) - # run_cmd(ctx.ZFS, ["mount", "testsn02@friday"]) - # run_cmd(ctx.ZPOOL, ["export", "-a"]) - # pool.destroy = False # already exported + ####################################################################### + preTest("snapshot hang") + with zpool_create(ctx, "testsn02", paths_to_unc(bf[:1])) as pool: + log_dl("after testsn02 pool create") + + allocate_file(pool.mount_path / "test01.file", 1 * Size.KIB) + run_cmd(ctx.ZFS, ["snapshot", "testsn02@friday"]) + allocate_file(pool.mount_path / "test02.file", 1 * Size.KIB) + run_cmd(ctx.ZFS, ["mount", "testsn02@friday"]) + run_cmd(ctx.ZPOOL, ["export", "-a"]) + pool.destroy = False # already exported ####################################################################### preTest("regex for key file") From 81779a63b7a6bd472e00b82e1305a307034c660e Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Thu, 19 Oct 2023 14:31:07 +0800 Subject: [PATCH 2/2] Revert "Re-enable test" This reverts commit 380a0e42dbfeceb52c983eebbf7d169da55f9db5. Signed-off-by: Andrew Innes --- .github/workflows/windows-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml index 5311c9707bc8..b1b249dd3cfd 100644 --- a/.github/workflows/windows-build-test.yml +++ b/.github/workflows/windows-build-test.yml @@ -215,7 +215,7 @@ jobs: needs: [build_windows] #, build_wsl] timeout-minutes: 30 runs-on: windows-latest - #if: ${{ false }} + if: ${{ false }} steps: - uses: actions/checkout@v3