Skip to content

Commit

Permalink
Workaround for gofmt change in Go 1.11
Browse files Browse the repository at this point in the history
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 <github@gone.nl>
  • Loading branch information
thaJeztah committed Jul 5, 2018
1 parent 39b6ba8 commit 383d750
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions content/testsuite/testsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions snapshots/testsuite/testsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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
Expand Down

0 comments on commit 383d750

Please sign in to comment.