From d8a4910eee1f62dc8182c77d5caba9650494941d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Mon, 28 Jan 2013 23:16:41 -0800 Subject: [PATCH] Fixed docker.fake so that fake.StartCommand() can be used on Darwin for testing --- fake/fake.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/fake/fake.go b/fake/fake.go index 990d84a0b5..a8c18a458e 100644 --- a/fake/fake.go +++ b/fake/fake.go @@ -5,9 +5,7 @@ import ( "math/rand" "io" "archive/tar" - "github.com/dotcloud/docker" "os/exec" - "strings" "github.com/kr/pty" ) @@ -56,27 +54,8 @@ func ContainerRunning() bool { return false } -type Container struct { - *docker.Container - Name string - Source string - Size uint - FilesChanged uint - BytesChanged uint -} -func NewContainer(c *docker.Container) *Container { - return &Container{ - Container: c, - Name: c.GetUserData("name"), - } -} -func (c *Container) CmdString() string { - return strings.Join(append([]string{c.Path}, c.Args...), " ") -} - - -func startCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadCloser, error) { +func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadCloser, error) { if interactive { term, err := pty.Start(cmd) if err != nil {