Move configmap testdata into zip

Paths names starting with '..' are triggering errors when using Go modules in Go >= 1.11 (1). To work around this we move the testdata into an archive which is unzipped as part of the test. (1) See: golang/go#24573
Helcaraxan · May 1, 2020 · d0612be · d0612be
1 parent d41a3fe
commit d0612be
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 10 deletions.
diff --git a/configmap/testdata.zip b/configmap/testdata.zip
diff --git a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint b/configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint
diff --git a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_int b/configmap/testdata/..1289_09_10_03_32_32.039823124/some_int
diff --git a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint b/configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint
diff --git a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_int b/configmap/testdata/..9289_09_10_03_32_32.039823124/some_int
diff --git a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint b/configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint
diff --git a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_int b/configmap/testdata/..9989_09_09_07_32_32.099817316/some_int
diff --git a/configmap/testdata/..data b/configmap/testdata/..data
diff --git a/configmap/testdata/some_dynint b/configmap/testdata/some_dynint
diff --git a/configmap/testdata/some_int b/configmap/testdata/some_int
diff --git a/configmap/updater_test.go b/configmap/updater_test.go
@@ -65,7 +65,7 @@ func (s *updaterTestSuite) TearDownTest() {
 }
 
 func (s *updaterTestSuite) copyTestDataToDir() {
-	copyCmd := exec.Command("cp", "--archive", "testdata", s.tempDir)
+	copyCmd := exec.Command("unzip", "testdata.zip", "-d", s.tempDir)
 	require.NoError(s.T(), copyCmd.Run(), "copying testdata directory to tempdir must not fail")
 }