Workaround for gofmt change in Go 1.11

thaJeztah · thaJeztah · commit 383d750d4f51 · 2018-07-05T11:05:30.000+02:00
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 974c7cb..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 <github@gone.nl>
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`367`	`367`	`labels := map[string]string{`
`368`	`368`	`"k1": "v1",`
`369`	`369`	`"k2": "v2",`
	`370`	`+`
`370`	`371`	`"containerd.io/gc.root": rootTime,`
`371`	`372`	`}`
`372`	`373`
`@@ -403,6 +404,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`403`	`404`
`404`	`405`	`info.Labels = map[string]string{`
`405`	`406`	`"k1": "v1",`
	`407`	`+`
`406`	`408`	`"containerd.io/gc.root": rootTime,`
`407`	`409`	`}`
`408`	`410`	`preUpdate = time.Now()`
Original file line number	Diff line number	Diff line change
`@@ -684,6 +684,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`684`	`684`	`expected = map[string]string{`
`685`	`685`	`"l1": "updated",`
`686`	`686`	`"l3": "v3",`
	`687`	`+`
`687`	`688`	`"containerd.io/gc.root": rootTime,`
`688`	`689`	`}`
`689`	`690`	`st.Labels = map[string]string{`
`@@ -698,6 +699,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`698`	`699`
`699`	`700`	`expected = map[string]string{`
`700`	`701`	`"l4": "v4",`
	`702`	`+`
`701`	`703`	`"containerd.io/gc.root": rootTime,`
`702`	`704`	`}`
`703`	`705`	`st.Labels = expected`