Skip to content

Commit 29b7501

Browse files
committed
Make test support non-deterministic file ordering in zip
Previously, the test required the zip contents to be in a specific order. This is not guaranteed. The important thing is that the zip contains the expected files, not what order the files happen to be in.
1 parent 3523792 commit 29b7501

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

libraries/zip/ziphelper_test.go

+14-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,18 @@ func TestZip(t *testing.T) {
2727
defer zipFileReader.Close()
2828

2929
require.Equal(t, 4, len(zipFileReader.File))
30-
require.Equal(t, "a_zip/", zipFileReader.File[0].Name)
31-
require.Equal(t, "a_zip/testfile.txt", zipFileReader.File[1].Name)
32-
require.Equal(t, "a_zip/testfolder/", zipFileReader.File[2].Name)
33-
require.Equal(t, "a_zip/testfolder/testfileinfolder.txt", zipFileReader.File[3].Name)
30+
31+
containsName := func(name string) bool {
32+
for _, file := range zipFileReader.File {
33+
if file.Name == name {
34+
return true
35+
}
36+
}
37+
38+
return false
39+
}
40+
require.True(t, containsName("a_zip/"))
41+
require.True(t, containsName("a_zip/testfile.txt"))
42+
require.True(t, containsName("a_zip/testfolder/"))
43+
require.True(t, containsName("a_zip/testfolder/testfileinfolder.txt"))
3444
}

0 commit comments

Comments
 (0)