toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post migration fixes

Browse Source 
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2017-12-21 16:27:57 -05:00
parent 39c2ca57c1
commit 5155cda716
28 changed files with 177 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/system/info_test.go
View File

@ -227,7 +227,7 @@ func TestPrettyPrintInfo(t *testing.T) {
},
} {
cli := test.NewFakeCli(&fakeClient{})
assert.Check(t, prettyPrintInfo(cli, tc.dockerInfo))
assert.NilError(t, prettyPrintInfo(cli, tc.dockerInfo))
golden.Assert(t, cli.OutBuffer().String(), tc.expectedGolden+".golden")
if tc.warningsGolden != "" {
golden.Assert(t, cli.ErrBuffer().String(), tc.warningsGolden+".golden")

13
cli/command/system/version_test.go
View File

@ -23,12 +23,15 @@ func TestVersionWithoutServer(t *testing.T) {
})
cmd := NewVersionCommand(cli)
cmd.SetOutput(cli.Err())
assert.Check(t, is.ErrorContains(cmd.Execute(), ""))
assert.Check(t, is.Contains(cleanTabs(cli.OutBuffer().String()), "Client:"))
assert.NotContains(t, cleanTabs(cli.OutBuffer().String()), "Server:")
assert.ErrorContains(t, cmd.Execute(), "no server")
out := cli.OutBuffer().String()
// TODO: use an assertion like e2e/image/build_test.go:assertBuildOutput()
// instead of contains/not contains
assert.Check(t, is.Contains(out, "Client:"))
assert.Assert(t, !strings.Contains(out, "Server:"), "actual: %s", out)
}
func fakeServerVersion(ctx context.Context) (types.Version, error) {
func fakeServerVersion(_ context.Context) (types.Version, error) {
return types.Version{
Version: "docker-dev",
APIVersion: api.DefaultVersion,
@ -39,7 +42,7 @@ func TestVersionWithOrchestrator(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{serverVersion: fakeServerVersion})
cli.SetClientInfo(func() command.ClientInfo { return command.ClientInfo{Orchestrator: "swarm"} })
cmd := NewVersionCommand(cli)
assert.Check(t, cmd.Execute())
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Contains(cleanTabs(cli.OutBuffer().String()), "Orchestrator: swarm"))
}