From 40e640561fc477b514c812376fe9251acf5cf0f6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Jun 2024 17:27:58 +0200 Subject: [PATCH] un-skip tests on Windows V19H1 (1903) and up This re-enables TestChangesDirsEmpty and TestChangesDirsMutated on current Windows versions. These tests were failing on Windows V19H1 (1903) and up, possibly due to changes in the kernel, and were skipped in commit 8f4b3b0ad41a5e3a29e57f0a8c55cb49e7a0b44f; === FAIL: github.com/docker/docker/pkg/archive TestChangesDirsEmpty (0.21s) changes_test.go:261: Reported changes for identical dirs: [{\dirSymlink C}] === FAIL: github.com/docker/docker/pkg/archive TestChangesDirsMutated (0.14s) changes_test.go:391: unexpected change "C \\dirSymlink" "\\dirnew" This reverts commit 8f4b3b0ad41a5e3a29e57f0a8c55cb49e7a0b44f. This reverts commit 3108165c94bf48014aa9f412193fe25852f1958f Signed-off-by: Sebastiaan van Stijn --- changes_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/changes_test.go b/changes_test.go index ddef6b9..0b696e8 100644 --- a/changes_test.go +++ b/changes_test.go @@ -245,10 +245,6 @@ func TestChangesWithChangesGH13590(t *testing.T) { // Create a directory, copy it, make sure we report no changes between the two func TestChangesDirsEmpty(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("FIXME: broken on Windows 1903 and up; see https://github.com/moby/moby/pull/39846") - } - src, err := os.MkdirTemp("", "docker-changes-test") assert.NilError(t, err) defer os.RemoveAll(src) @@ -331,10 +327,6 @@ func mutateSampleDir(t *testing.T, root string) { } func TestChangesDirsMutated(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("FIXME: broken on Windows 1903 and up; see https://github.com/moby/moby/pull/39846") - } - src, err := os.MkdirTemp("", "docker-changes-test") assert.NilError(t, err) createSampleDir(t, src)