From 194c7591c3f62c08cb382280b25516f80f71344b Mon Sep 17 00:00:00 2001 From: Liam Beckman Date: Tue, 24 Sep 2024 17:16:24 -0700 Subject: [PATCH] Fix test errors --- .github/workflows/s3.yaml | 2 +- storage/anonymous_get_test.go | 10 +++++++++- tes/utils_test.go | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/s3.yaml b/.github/workflows/s3.yaml index bf5d06139..1855fd519 100644 --- a/.github/workflows/s3.yaml +++ b/.github/workflows/s3.yaml @@ -26,7 +26,7 @@ jobs: - uses: actions/download-artifact@v4 with: - name: funnelBin + name: funnel - name: Start Funnel server run: | diff --git a/storage/anonymous_get_test.go b/storage/anonymous_get_test.go index d6ee19869..3e20251be 100644 --- a/storage/anonymous_get_test.go +++ b/storage/anonymous_get_test.go @@ -41,6 +41,10 @@ func TestAmazonS3AnonymousGet(t *testing.T) { endpoint: "", } + // AWS S3 Public Datasets: + // - https://registry.opendata.aws/ + // 1000 Genomes Public Dataset: + // - https://registry.opendata.aws/1000-genomes/ _, err = store.Get(context.Background(), "s3://1000genomes/README.analysis_history", "_test_download/README.analysis_history") if err != nil { t.Error("Error downloading file:", err) @@ -55,7 +59,11 @@ func TestGoogleStorageAnonymousGet(t *testing.T) { store := &GoogleCloud{svc} - _, err = store.Get(context.Background(), "gs://uspto-pair/applications/07820856.zip", "_test_download/07820856.zip") + // Google Cloud Public Datasets: + // - https://cloud.google.com/datasets?hl=en + // Broad Institute Public Dataset: + // - https://console.cloud.google.com/storage/browser/gcp-public-data--broad-references;tab=objects?prefix=&forceOnObjectsSortingFiltering=false + _, err = store.Get(context.Background(), "gs://gcp-public-data--broad-references/C.elegans/WBcel235/README.txt", "_test_download/README.txt") if err != nil { t.Error("Error downloading file:", err) } diff --git a/tes/utils_test.go b/tes/utils_test.go index b89a6c1b2..df511b8a3 100644 --- a/tes/utils_test.go +++ b/tes/utils_test.go @@ -16,7 +16,7 @@ func TestBase64Encode(t *testing.T) { }, } - expected := "ewogICJleGVjdXRvcnMiOiBbCiAgICB7CiAgICAgICJjb21tYW5kIjogWwogICAgICAgICJlY2hvIiwKICAgICAgICAiaGVsbG8gd29ybGQiCiAgICAgIF0sCiAgICAgICJpbWFnZSI6ICJhbHBpbmUiCiAgICB9CiAgXSwKICAiaWQiOiAidGFzazEiCn0=" + expected := "ewogICJleGVjdXRvcnMiOiAgWwogICAgewogICAgICAiY29tbWFuZCI6ICBbCiAgICAgICAgImVjaG8iLAogICAgICAgICJoZWxsbyB3b3JsZCIKICAgICAgXSwKICAgICAgImltYWdlIjogICJhbHBpbmUiCiAgICB9CiAgXSwKICAiaWQiOiAgInRhc2sxIgp9" encoded, err := Base64Encode(task) if err != nil {