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

Merge pull request #3623 from fuweid/me-sort-before-check

Browse Source 
config_test: sort result before check
This commit is contained in:
Michael Crosby 2019-09-05 09:06:17 -04:00 committed by GitHub
commit 77abec43c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/server/config/config_test.go
View File

@ -20,6 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sort"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/assert"
@ -175,6 +176,7 @@ imports = ["data1.toml", "data2.toml"]
assert.Equal(t, "/var/lib/containerd", out.Root) assert.Equal(t, "/var/lib/containerd", out.Root)
assert.DeepEqual(t, []string{"io.containerd.v1.xyz"}, out.DisabledPlugins) assert.DeepEqual(t, []string{"io.containerd.v1.xyz"}, out.DisabledPlugins)
sort.Strings(out.Imports)
assert.DeepEqual(t, []string{ assert.DeepEqual(t, []string{
filepath.Join(tempDir, "data1.toml"), filepath.Join(tempDir, "data1.toml"),
filepath.Join(tempDir, "data2.toml"), filepath.Join(tempDir, "data2.toml"),