summaryrefslogtreecommitdiff
path: root/integration-cli/docker_api_attach_test.go
diff options
context:
space:
mode:
authorTonis Tiigi <tonistiigi@gmail.com>2016-06-13 19:54:20 -0700
committerTonis Tiigi <tonistiigi@gmail.com>2016-06-13 22:16:18 -0700
commit0d88d5b64b69a451d374e322b2abe64140a6cd1c (patch)
tree8632239a5febf0990191bdaa8b57e98c5c420c49 /integration-cli/docker_api_attach_test.go
parent534a90a99367af6f6bba1ddcc7eb07506e41f774 (diff)
downloaddocker-0d88d5b64b69a451d374e322b2abe64140a6cd1c.tar.gz
Swarm integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Victor Vieux <vieux@docker.com>
Diffstat (limited to 'integration-cli/docker_api_attach_test.go')
-rw-r--r--integration-cli/docker_api_attach_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go
index a9fcc962b6..740ce6ecdd 100644
--- a/integration-cli/docker_api_attach_test.go
+++ b/integration-cli/docker_api_attach_test.go
@@ -17,7 +17,7 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {
testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "run", "-dit", "busybox", "cat")
- rwc, err := sockConn(time.Duration(10 * time.Second))
+ rwc, err := sockConn(time.Duration(10*time.Second), "")
c.Assert(err, checker.IsNil)
cleanedContainerID := strings.TrimSpace(out)
@@ -67,7 +67,7 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {
// regression gh14320
func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) {
- req, client, err := newRequestClient("POST", "/containers/doesnotexist/attach", nil, "")
+ req, client, err := newRequestClient("POST", "/containers/doesnotexist/attach", nil, "", "")
c.Assert(err, checker.IsNil)
resp, err := client.Do(req)