6f8070deb2
Since go 1.7, "context" is a standard package. Since go 1.9,
x/net/context merely provides some types aliased to those in
the standard context package.
The changes were performed by the following script:
for f in $(git ls-files \*.go | grep -v ^vendor/); do
sed -i 's|golang.org/x/net/context|context|' $f
goimports -w $f
for i in 1 2; do
awk '/^$/ {e=1; next;}
/\t"context"$/ {e=0;}
{if (e) {print ""; e=0}; print;}' < $f > $f.new && \
mv $f.new $f
goimports -w $f
done
done
[v2: do awk/goimports fixup twice]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
52 lines
1.5 KiB
Go
52 lines
1.5 KiB
Go
package system
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/gotestyourself/gotestyourself/assert"
|
|
is "github.com/gotestyourself/gotestyourself/assert/cmp"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api"
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
func TestVersionWithoutServer(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
serverVersion: func(ctx context.Context) (types.Version, error) {
|
|
return types.Version{}, fmt.Errorf("no server")
|
|
},
|
|
})
|
|
cmd := NewVersionCommand(cli)
|
|
cmd.SetOutput(cli.Err())
|
|
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(_ context.Context) (types.Version, error) {
|
|
return types.Version{
|
|
Version: "docker-dev",
|
|
APIVersion: api.DefaultVersion,
|
|
}, nil
|
|
}
|
|
|
|
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.NilError(t, cmd.Execute())
|
|
assert.Check(t, is.Contains(cleanTabs(cli.OutBuffer().String()), "Orchestrator: swarm"))
|
|
}
|
|
|
|
func cleanTabs(line string) string {
|
|
return strings.Join(strings.Fields(line), " ")
|
|
}
|