From 383d750d4f51ad44f18272c84922a665c486c58d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 5 Jul 2018 10:33:59 +0200 Subject: [PATCH] Workaround for gofmt change in Go 1.11 Go 1.11 uses a different formatting for maps, and now aligns values; running `gofmt -s -w` on this file resulted in this diff; ```patch content/testsuite/testsuite.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index 974c7cb8ed..d9ae9dc160 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -365,8 +365,8 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) { rootTime := time.Now().UTC().Format(time.RFC3339) labels := map[string]string{ - "k1": "v1", - "k2": "v2", + "k1": "v1", + "k2": "v2", "containerd.io/gc.root": rootTime, } @@ -402,7 +402,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) { } info.Labels = map[string]string{ - "k1": "v1", + "k1": "v1", "containerd.io/gc.root": rootTime, } preUpdate = time.Now() ``` Adding a whitespace before the long key to make it format the same on both Go 1.11 and older versions of Go. Signed-off-by: Sebastiaan van Stijn --- content/testsuite/testsuite.go | 2 ++ snapshots/testsuite/testsuite.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index 974c7cb8ed62..366926c16289 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -367,6 +367,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) { labels := map[string]string{ "k1": "v1", "k2": "v2", + "containerd.io/gc.root": rootTime, } @@ -403,6 +404,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) { info.Labels = map[string]string{ "k1": "v1", + "containerd.io/gc.root": rootTime, } preUpdate = time.Now() diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index 6a1be0a6946e..97a5cb4a8a27 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -684,6 +684,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh expected = map[string]string{ "l1": "updated", "l3": "v3", + "containerd.io/gc.root": rootTime, } st.Labels = map[string]string{ @@ -698,6 +699,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh expected = map[string]string{ "l4": "v4", + "containerd.io/gc.root": rootTime, } st.Labels = expected