Merge pull request #3521 from nalind/exclusions

conformance: add more tests for exclusion short-circuiting
containers · Sep 16, 2021 · 753716a · 753716a
2 parents 52dfdd7 + cf984eb
commit 753716a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 0 deletions.
diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go
@@ -2870,4 +2870,16 @@ var internalTestCases = []testCase{
 		contextDir: "dockerignore/exceptions-skip",
 		fsSkip:     []string{"(dir):volume:mtime"},
 	},
+
+	{
+		name:       "dockerignore-exceptions-weirdness-1",
+		contextDir: "dockerignore/exceptions-weirdness-1",
+		fsSkip:     []string{"(dir):newdir:mtime", "(dir):newdir:(dir):subdir:mtime"},
+	},
+
+	{
+		name:       "dockerignore-exceptions-weirdness-2",
+		contextDir: "dockerignore/exceptions-weirdness-2",
+		fsSkip:     []string{"(dir):newdir:mtime", "(dir):newdir:(dir):subdir:mtime"},
+	},
 }
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/.dockerignore
@@ -0,0 +1,2 @@
+subdir
+!*/sub1*
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/Dockerfile
@@ -0,0 +1,2 @@
+FROM alpine
+COPY ./ /newdir
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub1.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub1.txt
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub2.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub2.txt
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub3.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-1/subdir/sub3.txt
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/.dockerignore
@@ -0,0 +1,3 @@
+subdir
+!*/sub1*
+!subdir/sub3*
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/Dockerfile
@@ -0,0 +1,2 @@
+FROM alpine
+COPY ./ /newdir
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub1.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub1.txt
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub2.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub2.txt
diff --git a/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub3.txt b/tests/conformance/testdata/dockerignore/exceptions-weirdness-2/subdir/sub3.txt