InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update trustedCmd to be compatible with testutil/cmd

Browse Source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester
2017-01-05 19:08:24 +01:00
parent 87e3fcfe1e
commit 303b1d200a
23 changed files with 349 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
integration-cli/docker_cli_daemon_plugins_test.go
View File

@@ -4,14 +4,13 @@ package main
import (
"os"
"os/exec"
"path/filepath"
"strings"
"syscall"
icmd "github.com/docker/docker/pkg/testutil/cmd"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/pkg/mount"
icmd "github.com/docker/docker/pkg/testutil/cmd"
"github.com/go-check/check"
)
@@ -153,7 +152,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
icmd.RunCommand("pgrep", "-f", pluginProcessName).Assert(c, icmd.Expected{
ExitCode: 1,
Error: "exit status 1",
Error: "exit status 1",
})
s.d.Start(c, "--live-restore")