mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Recfactor: Use dockerCmd when possible in integration-cli tests
Part of #14603 integration-cli/docker_cli_links_test.go (coolljt0725) integration-cli/docker_cli_links_unix_test.go (coolljt0725) integration-cli/docker_cli_logs_test.go (coolljt0725) integration-cli/docker_cli_nat_test.go (coolljt0725) integration-cli/docker_cli_network_test.go (coolljt0725) integration-cli/docker_cli_stats_test.go (coolljt0725) integration-cli/docker_cli_tag_test.go (coolljt0725) integration-cli/docker_cli_top_test.go (coolljt0725) integration-cli/docker_cli_version_test.go (coolljt0725) integration-cli/docker_cli_wait_test.go (coolljt0725 Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
parent
c6cde91b7d
commit
eef6eda7d2
10 changed files with 96 additions and 372 deletions
|
@ -1,7 +1,6 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/go-check/check"
|
||||
|
@ -9,12 +8,7 @@ import (
|
|||
|
||||
// ensure docker version works
|
||||
func (s *DockerSuite) TestVersionEnsureSucceeds(c *check.C) {
|
||||
versionCmd := exec.Command(dockerBinary, "version")
|
||||
out, _, err := runCommandWithOutput(versionCmd)
|
||||
if err != nil {
|
||||
c.Fatalf("failed to execute docker version: %s, %v", out, err)
|
||||
}
|
||||
|
||||
out, _ := dockerCmd(c, "version")
|
||||
stringsToCheck := map[string]int{
|
||||
"Client:": 1,
|
||||
"Server:": 1,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue