Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test for Go 1.12.x 

After switching to Go 1.12, the format-string causes an error;

```
=== Errors
cli/config/config_test.go:154:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:217:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:253:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:288:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:435:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile
cli/config/config_test.go:448:3: Fatalf format %q has arg config of wrong type *github.com/docker/cli/cli/config/configfile.ConfigFile

DONE 1115 tests, 2 skipped, 6 errors in 215.984s
make: *** [Makefile:22: test-coverage] Error 2
Exited with code 2
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-03-04 18:44:07 +01:00
parent 8ddde26af6
commit d4877fb225
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cli/config/config_test.go
View File

@ -150,9 +150,8 @@ func TestOldValidAuth(t *testing.T) {
// defaultIndexserver is https://index.docker.io/v1/ // defaultIndexserver is https://index.docker.io/v1/
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
// Now save it and make sure it shows up in new form // Now save it and make sure it shows up in new form
configStr := saveConfigAndValidateNewFormat(t, config, tmpHome) configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
@ -213,9 +212,8 @@ func TestOldJSON(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
// Now save it and make sure it shows up in new form // Now save it and make sure it shows up in new form
configStr := saveConfigAndValidateNewFormat(t, config, tmpHome) configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
@ -249,9 +247,8 @@ func TestNewJSON(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
// Now save it and make sure it shows up in new form // Now save it and make sure it shows up in new form
configStr := saveConfigAndValidateNewFormat(t, config, tmpHome) configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
@ -284,9 +281,8 @@ func TestNewJSONNoEmail(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
// Now save it and make sure it shows up in new form // Now save it and make sure it shows up in new form
configStr := saveConfigAndValidateNewFormat(t, config, tmpHome) configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
@ -431,10 +427,8 @@ func TestJSONReaderNoFile(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
} }
func TestOldJSONReaderNoFile(t *testing.T) { func TestOldJSONReaderNoFile(t *testing.T) {
@ -444,9 +438,8 @@ func TestOldJSONReaderNoFile(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
ac := config.AuthConfigs["https://index.docker.io/v1/"] ac := config.AuthConfigs["https://index.docker.io/v1/"]
if ac.Username != "joejoe" || ac.Password != "hello" { assert.Equal(t, ac.Username, "joejoe")
t.Fatalf("Missing data from parsing:\n%q", config) assert.Equal(t, ac.Password, "hello")
}
} }
func TestJSONWithPsFormatNoFile(t *testing.T) { func TestJSONWithPsFormatNoFile(t *testing.T) {