0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10747 from ahmetalpbalkan/win-cli/TestContainersAttachWS-fix

Browse source 
TestGetContainersAttachWebsocket: use DOCKER_TEST_HOST if specified
This commit is contained in:
Arnaud Porterie 2015-02-16 09:19:54 -08:00
commit 38ca779dd6
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_api_attach_test.go
View file

@ -2,9 +2,9 @@ package main
import ( import (
"bytes" "bytes"
"net"
"os/exec" "os/exec"
"testing" "testing"
"time"
"code.google.com/p/go.net/websocket" "code.google.com/p/go.net/websocket"
) )
@ -17,7 +17,7 @@ func TestGetContainersAttachWebsocket(t *testing.T) {
} }
defer deleteAllContainers() defer deleteAllContainers()
rwc, err := net.Dial("unix", "/var/run/docker.sock") rwc, err := sockConn(time.Duration(10 * time.Second))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

36
integration-cli/docker_utils.go
View file

@ -273,6 +273,24 @@ func daemonHost() string {
return daemonUrlStr return daemonUrlStr
} }
func sockConn(timeout time.Duration) (net.Conn, error) {
daemon := daemonHost()
daemonUrl, err := url.Parse(daemon)
if err != nil {
return nil, fmt.Errorf("could not parse url %q: %v", daemon, err)
}
var c net.Conn
switch daemonUrl.Scheme {
case "unix":
return net.DialTimeout(daemonUrl.Scheme, daemonUrl.Path, timeout)
case "tcp":
return net.DialTimeout(daemonUrl.Scheme, daemonUrl.Host, timeout)
default:
return c, fmt.Errorf("unknown scheme %v (%s)", daemonUrl.Scheme, daemon)
}
}
func sockRequest(method, endpoint string, data interface{}) ([]byte, error) { func sockRequest(method, endpoint string, data interface{}) ([]byte, error) {
jsonData := bytes.NewBuffer(nil) jsonData := bytes.NewBuffer(nil)
if err := json.NewEncoder(jsonData).Encode(data); err != nil { if err := json.NewEncoder(jsonData).Encode(data); err != nil {
@ -283,23 +301,9 @@ func sockRequest(method, endpoint string, data interface{}) ([]byte, error) {
} }
func sockRequestRaw(method, endpoint string, data io.Reader, ct string) ([]byte, error) { func sockRequestRaw(method, endpoint string, data io.Reader, ct string) ([]byte, error) {
daemon := daemonHost() c, err := sockConn(time.Duration(10 * time.Second))
daemonUrl, err := url.Parse(daemon)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not parse url %q: %v", daemon, err) return nil, fmt.Errorf("could not dial docker daemon: %v", err)
}
var c net.Conn
switch daemonUrl.Scheme {
case "unix":
c, err = net.DialTimeout(daemonUrl.Scheme, daemonUrl.Path, time.Duration(10*time.Second))
case "tcp":
c, err = net.DialTimeout(daemonUrl.Scheme, daemonUrl.Host, time.Duration(10*time.Second))
default:
err = fmt.Errorf("unknown scheme %v", daemonUrl.Scheme)
}
if err != nil {
return nil, fmt.Errorf("could not dial docker daemon at %s: %v", daemon, err)
} }
client := httputil.NewClientConn(c, nil) client := httputil.NewClientConn(c, nil)