Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Fix tests to not make long unix domain socketpaths

Browse source 
Some tests were running into this issue:
https://github.com/golang/go/issues/6895

Putting the sockets into temp dirs fixes the problem.
This commit is contained in:
Issac Trotts 2016-08-29 18:09:46 -07:00
parent 7ba804353c
commit 1991083322
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
caddyhttp/proxy/proxy_test.go
View file

@ -200,10 +200,11 @@ func TestUnixSocketProxy(t *testing.T) {
})) }))
// Get absolute path for unix: socket // Get absolute path for unix: socket
socketPath, err := filepath.Abs("./test_socket") dir, err := ioutil.TempDir("", "caddy_test")
if err != nil { if err != nil {
t.Fatalf("Unable to get absolute path: %v", err) t.Fatalf("Failed to make temp dir to contain unix socket. %v", err)
} }
socketPath := filepath.Join(dir, "test_socket")
// Change httptest.Server listener to listen to unix: socket // Change httptest.Server listener to listen to unix: socket
ln, err := net.Listen("unix", socketPath) ln, err := net.Listen("unix", socketPath)
@ -258,10 +259,11 @@ func GetSocketProxy(messageFormat string, prefix string) (*Proxy, *httptest.Serv
fmt.Fprintf(w, messageFormat, r.URL.String()) fmt.Fprintf(w, messageFormat, r.URL.String())
})) }))
socketPath, err := filepath.Abs("./test_socket") dir, err := ioutil.TempDir("", "caddy_test")
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("Unable to get absolute path: %v", err) return nil, nil, fmt.Errorf("Failed to make temp dir to contain unix socket. %v", err)
} }
socketPath := filepath.Join(dir, "test_socket")
ln, err := net.Listen("unix", socketPath) ln, err := net.Listen("unix", socketPath)
if err != nil { if err != nil {