Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

serve/http: compare zip test output semantically

Mikel Olasagasti Uranga169f5b714cc2
diff --git a/cmd/serve/http/http_test.go b/cmd/serve/http/http_test.go
index 1a94b0d65..a3dada7cd 100644
--- a/cmd/serve/http/http_test.go
+++ b/cmd/serve/http/http_test.go
@@ -1,6 +1,8 @@
package http
import (
+ "archive/zip"
+ "bytes"
"compress/gzip"
"context"
"flag"
@@ -25,6 +27,11 @@ import (
"github.com/stretchr/testify/require"
)
+type zipEntry struct {
+ IsDir bool
+ Contents string
+}
+
var (
updateGolden = flag.Bool("updategolden", false, "update golden files for regression test")
)
@@ -102,12 +109,39 @@ func checkGolden(t *testing.T, fileName string, got []byte) {
} else {
want, err := os.ReadFile(fileName)
require.NoError(t, err)
+ if strings.HasSuffix(fileName, ".zip") {
+ assert.Equal(t, readZip(t, want), readZip(t, got), fileName)
+ return
+ }
wants := strings.Split(string(want), "\n")
gots := strings.Split(string(got), "\n")
assert.Equal(t, wants, gots, fileName)
}
}
+func readZip(t *testing.T, data []byte) map[string]zipEntry {
+ t.Helper()
+ zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
+ require.NoError(t, err)
+
+ entries := make(map[string]zipEntry, len(zr.File))
+ for _, f := range zr.File {
+ entry := zipEntry{
+ IsDir: f.FileInfo().IsDir(),
+ }
+ if !entry.IsDir {
+ rc, err := f.Open()
+ require.NoError(t, err)
+ contents, err := io.ReadAll(rc)
+ require.NoError(t, err)
+ require.NoError(t, rc.Close())
+ entry.Contents = string(contents)
+ }
+ entries[f.Name] = entry
+ }
+ return entries
+}
+
func testGET(t *testing.T, useProxy bool) {
ctx := context.Background()
// ci := fs.GetConfig(ctx)