From 377ecbe077c27139fe87341c0ab7fb4bbcf5d433 Mon Sep 17 00:00:00 2001 From: Cathy Ouyang Date: Tue, 7 Jan 2025 13:20:46 -0800 Subject: [PATCH 1/2] test(storage): fix emulated tests for metadata on read --- storage/client_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/storage/client_test.go b/storage/client_test.go index 403a04b84bc1..ddffa754c017 100644 --- a/storage/client_test.go +++ b/storage/client_test.go @@ -796,7 +796,7 @@ func TestOpenReaderEmulated(t *testing.T) { } func TestOpenReaderEmulated_Metadata(t *testing.T) { - transportClientTest(context.Background(), t, func(t *testing.T, ctx context.Context, project, bucket string, client storageClient) { + transportClientTest(skipHTTP("metadata on read not supported in testbench rest server"), t, func(t *testing.T, ctx context.Context, project, bucket string, client storageClient) { // Populate test data. _, err := client.CreateBucket(ctx, project, bucket, &BucketAttrs{ Name: bucket, @@ -849,8 +849,13 @@ func TestOpenReaderEmulated_Metadata(t *testing.T) { "Custom-Key": "custom-value", "Some-Other-Key": "some-other-value", } - if diff := cmp.Diff(r.Metadata(), expectedMetadata); diff != "" { - t.Fatalf("Object Metadata: got(-),want(+):\n%s", diff) + gotMetaData := r.Metadata() + // Testbench specific metadata is included for testing purposes. + for key, expectedValue := range expectedMetadata { + actualValue, ok := gotMetaData[key] + if !ok || actualValue != expectedValue { + t.Fatalf("Object Metadata: Expected key %q with value %q, but got %q", key, expectedValue, actualValue) + } } }) From ace50f72e340435e1cd045d8bb5a9ea002f76ebb Mon Sep 17 00:00:00 2001 From: Cathy Ouyang Date: Tue, 7 Jan 2025 14:48:24 -0800 Subject: [PATCH 2/2] correct test name format --- storage/client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/client_test.go b/storage/client_test.go index ddffa754c017..70803af058c9 100644 --- a/storage/client_test.go +++ b/storage/client_test.go @@ -795,7 +795,7 @@ func TestOpenReaderEmulated(t *testing.T) { }) } -func TestOpenReaderEmulated_Metadata(t *testing.T) { +func TestOpenReaderMetadataEmulated(t *testing.T) { transportClientTest(skipHTTP("metadata on read not supported in testbench rest server"), t, func(t *testing.T, ctx context.Context, project, bucket string, client storageClient) { // Populate test data. _, err := client.CreateBucket(ctx, project, bucket, &BucketAttrs{