From 4237bbc42ac9e5de4ab68cdb06b8a2257190da93 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Sat, 27 Oct 2018 12:07:54 -0700 Subject: [PATCH] storagetesting: verify progress callbacks --- internal/storagetesting/verify.go | 6 +++++- storage/gcs/gcs_storage_test.go | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/storagetesting/verify.go b/internal/storagetesting/verify.go index 303e54aac..a8a3486af 100644 --- a/internal/storagetesting/verify.go +++ b/internal/storagetesting/verify.go @@ -27,9 +27,13 @@ func VerifyStorage(ctx context.Context, t *testing.T, r storage.Storage) { AssertGetBlockNotFound(ctx, t, r, b.blk) } + ctx2 := storage.WithUploadProgressCallback(ctx, func(desc string, completed, total int64) { + log.Infof("progress %v: %v/%v", desc, completed, total) + }) + // Now add blocks. for _, b := range blocks { - if err := r.PutBlock(ctx, b.blk, b.contents); err != nil { + if err := r.PutBlock(ctx2, b.blk, b.contents); err != nil { t.Errorf("can't put block: %v", err) } diff --git a/storage/gcs/gcs_storage_test.go b/storage/gcs/gcs_storage_test.go index a7a60df4e..2859bde4d 100644 --- a/storage/gcs/gcs_storage_test.go +++ b/storage/gcs/gcs_storage_test.go @@ -34,4 +34,6 @@ func TestGCSStorage(t *testing.T) { } storagetesting.VerifyStorage(ctx, t, st) + storagetesting.AssertConnectionInfoRoundTrips(ctx, t, st) + }