Workaround for gofmt change in Go 1.11

thaJeztah · thaJeztah · commit 0fc64b682c0a · 2019-03-07T14:14:14.000+01: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> (cherry picked from commit 383d750) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -401,6 +401,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,
 	}
 
@@ -437,6 +438,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
@@ -687,6 +687,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{
@@ -701,6 +702,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
`@@ -401,6 +401,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`401`	`401`	`labels := map[string]string{`
`402`	`402`	`"k1": "v1",`
`403`	`403`	`"k2": "v2",`
	`404`	`+`
`404`	`405`	`"containerd.io/gc.root": rootTime,`
`405`	`406`	`}`
`406`	`407`
`@@ -437,6 +438,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {`
`437`	`438`
`438`	`439`	`info.Labels = map[string]string{`
`439`	`440`	`"k1": "v1",`
	`441`	`+`
`440`	`442`	`"containerd.io/gc.root": rootTime,`
`441`	`443`	`}`
`442`	`444`	`preUpdate = time.Now()`
Original file line number	Diff line number	Diff line change
`@@ -687,6 +687,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`687`	`687`	`expected = map[string]string{`
`688`	`688`	`"l1": "updated",`
`689`	`689`	`"l3": "v3",`
	`690`	`+`
`690`	`691`	`"containerd.io/gc.root": rootTime,`
`691`	`692`	`}`
`692`	`693`	`st.Labels = map[string]string{`
`@@ -701,6 +702,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh`
`701`	`702`
`702`	`703`	`expected = map[string]string{`
`703`	`704`	`"l4": "v4",`
	`705`	`+`
`704`	`706`	`"containerd.io/gc.root": rootTime,`
`705`	`707`	`}`
`706`	`708`	`st.Labels = expected`