Fixing broken integration test (#2026)

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/internal/tests/integration/datasources_blob_test.go b/internal/tests/integration/datasources_blob_test.go
index bdf575ac..9cfcfd29 100644
--- a/internal/tests/integration/datasources_blob_test.go
+++ b/internal/tests/integration/datasources_blob_test.go
@@ -45,12 +45,14 @@ func setupDatasourcesBlobTest(t *testing.T) *httptest.Server {
 
 func TestDatasources_Blob_S3Datasource(t *testing.T) {
 	o, e, err := cmd(t,
-		"-c", "data=s3://ryft-public-sample-data/integration_test_dataset.json?region=us-east-1&type=application/array+json",
-		"-i", "{{ $d := index .data 0 }}{{ $d.firstName }} {{ $d.lastName }}").
+		"-c", "data=s3://noaa-bathymetry-pds/csv/2022/03/02/20220302_056e577c7cd8323fdd8a04d3812cf78e_pointData.csv?region=us-east-1&type=text/csv",
+		"-i", `{{ index (index .data 0) 6 }}: {{ index (index .data 1) 6 }}
+{{ index (index .data 0) 5 }}: {{ index (index .data 1) 5 }}`).
 		withEnv("AWS_ANON", "true").
 		withEnv("AWS_TIMEOUT", "5000").
 		run()
-	assertSuccess(t, o, e, err, "Petra Mcintyre")
+	assertSuccess(t, o, e, err, `PLATFORM_NAME: Ramform Hyperion
+TIME: 2022-03-01T22:00:04.000Z`)
 
 	srv := setupDatasourcesBlobTest(t)
 
@@ -79,12 +81,16 @@ func TestDatasources_Blob_S3Datasource(t *testing.T) {
 }
 
 func TestDatasources_Blob_S3Directory(t *testing.T) {
-	o, e, err := cmd(t, "-c", "data=s3://ryft-public-sample-data/?region=us-east-1",
+	// This recently replaced ryft-public-sample-data after access was disabled.
+	// This bucket came from https://registry.opendata.aws, and is public. The
+	// content isn't important, just that it's something we can read and parse
+	// on a _real_ S3 bucket.
+	o, e, err := cmd(t, "-c", "data=s3://noaa-bathymetry-pds/csv/2022/03/02/?region=us-east-1",
 		"-i", "{{ index .data 0 }}").
 		withEnv("AWS_ANON", "true").
 		withEnv("AWS_TIMEOUT", "15000").
 		run()
-	assertSuccess(t, o, e, err, "AWS-x86-AMI-queries.json")
+	assertSuccess(t, o, e, err, "20220302_056e577c7cd8323fdd8a04d3812cf78e_pointData.csv")
 
 	srv := setupDatasourcesBlobTest(t)
 
diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go
index 200089c6..d12bbeaf 100644
--- a/internal/tests/integration/integration_test.go
+++ b/internal/tests/integration/integration_test.go
@@ -60,9 +60,9 @@ func inOutContains(t *testing.T, i, o string) {
 func assertSuccess(t *testing.T, o, e string, err error, expected string) {
 	t.Helper()
 
+	require.NoError(t, err)
 	assert.Equal(t, "", e)
 	assert.Equal(t, expected, o)
-	require.NoError(t, err)
 }
 
 func assertFailed(t *testing.T, o, e string, err error, expected string) {