"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
serve s3: test the s3 backend with directory markers against serve s3
Nick Craig-Wood41aafbdb9238
diff --git a/cmd/serve/s3/s3_test.go b/cmd/serve/s3/s3_test.goindex 37d4d399c..66156bc0a 100644--- a/cmd/serve/s3/s3_test.go+++ b/cmd/serve/s3/s3_test.go@@ -8,6 +8,7 @@ import ("context""fmt""io"+ "maps""net/http""net/http/httptest""net/url"@@ -53,9 +54,13 @@ const (// which case the credentials are handed to the test proxy via the// environment rather than --auth-key.func serveS3(t *testing.T, f fs.Fs) (testURL string, keyid string, keysec string, w *Server) {+ return serveS3Opt(t, f, Opt)+}++// serveS3Opt is serveS3 with the options opt.+func serveS3Opt(t *testing.T, f fs.Fs, opt Options) (testURL string, keyid string, keysec string, w *Server) {keyid = random.String(16)keysec = random.String(16)- opt := Opt // copy default optionsif f == nil {t.Setenv("RCLONE_TEST_PROXY_AUTH_KEY", fmt.Sprintf("%s,%s", keyid, keysec))} else {@@ -74,8 +79,14 @@ func serveS3(t *testing.T, f fs.Fs) (testURL string, keyid string, keysec string// startS3 builds the start callback that brings up a serve s3 server// wrapping f and returns the client config for connecting to it.func startS3(t *testing.T) servetest.StartFn {+ return startS3Opt(t, Opt, nil)+}++// startS3Opt is startS3 with the server options opt and the extra+// backend config extra.+func startS3Opt(t *testing.T, opt Options, extra configmap.Simple) servetest.StartFn {return func(f fs.Fs) (configmap.Simple, func()) {- testURL, keyid, keysec, _ := serveS3(t, f)+ testURL, keyid, keysec, _ := serveS3Opt(t, f, opt)// Config for the backend we'll use to connect to the serverconfig := configmap.Simple{"type": "s3",@@ -84,6 +95,7 @@ func startS3(t *testing.T) servetest.StartFn {"access_key_id": keyid,"secret_access_key": keysec,}+ maps.Copy(config, extra)return config, func() {}}}@@ -96,6 +108,14 @@ func TestS3(t *testing.T) {servetest.Run(t, "s3", startS3(t))}+// TestS3DirectoryMarkers runs the s3 backend integration tests with+// directory markers against the s3 server with --directory-markers.+func TestS3DirectoryMarkers(t *testing.T) {+ opt := Opt+ opt.DirectoryMarkers = true+ servetest.Run(t, "s3", startS3Opt(t, opt, configmap.Simple{"directory_markers": "true"}))+}+// TestS3Minio runs the s3 server backed by a minio docker container// (via fstest/testserver/init.d/TestS3Minio) then runs the s3 backend// integration tests against it. Minio supports OpenChunkWriter, so