From 29b7501bdbe5d551422e66810fe8be9d10834319 Mon Sep 17 00:00:00 2001 From: per1234 Date: Sun, 9 May 2021 17:08:25 -0700 Subject: [PATCH] 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. --- libraries/zip/ziphelper_test.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libraries/zip/ziphelper_test.go b/libraries/zip/ziphelper_test.go index 8d9566f7..02159523 100644 --- a/libraries/zip/ziphelper_test.go +++ b/libraries/zip/ziphelper_test.go @@ -27,8 +27,18 @@ func TestZip(t *testing.T) { defer zipFileReader.Close() require.Equal(t, 4, len(zipFileReader.File)) - require.Equal(t, "a_zip/", zipFileReader.File[0].Name) - require.Equal(t, "a_zip/testfile.txt", zipFileReader.File[1].Name) - require.Equal(t, "a_zip/testfolder/", zipFileReader.File[2].Name) - require.Equal(t, "a_zip/testfolder/testfileinfolder.txt", zipFileReader.File[3].Name) + + containsName := func(name string) bool { + for _, file := range zipFileReader.File { + if file.Name == name { + return true + } + } + + return false + } + require.True(t, containsName("a_zip/")) + require.True(t, containsName("a_zip/testfile.txt")) + require.True(t, containsName("a_zip/testfolder/")) + require.True(t, containsName("a_zip/testfolder/testfileinfolder.txt")) }