github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2436 from thaJeztah/fix_gofmt

Browse Source 
Workaround for gofmt change in Go 1.11
This commit is contained in:
Michael Crosby 2018-07-17 14:52:29 -04:00 committed by GitHub
commit e17969caad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/testsuite/testsuite.go
View File

@ -367,6 +367,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
labels := map[string]string{ labels := map[string]string{
"k1": "v1", "k1": "v1",
"k2": "v2", "k2": "v2",
"containerd.io/gc.root": rootTime, "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{ info.Labels = map[string]string{
"k1": "v1", "k1": "v1",
"containerd.io/gc.root": rootTime, "containerd.io/gc.root": rootTime,
} }
preUpdate = time.Now() preUpdate = time.Now()

2
snapshots/testsuite/testsuite.go
View File

@ -684,6 +684,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh
expected = map[string]string{ expected = map[string]string{
"l1": "updated", "l1": "updated",
"l3": "v3", "l3": "v3",
"containerd.io/gc.root": rootTime, "containerd.io/gc.root": rootTime,
} }
st.Labels = map[string]string{ st.Labels = map[string]string{
@ -698,6 +699,7 @@ func checkUpdate(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsh
expected = map[string]string{ expected = map[string]string{
"l4": "v4", "l4": "v4",
"containerd.io/gc.root": rootTime, "containerd.io/gc.root": rootTime,
} }
st.Labels = expected st.Labels = expected