Commit 19910833 authored by Issac Trotts's avatar Issac Trotts

Fix tests to not make long unix domain socketpaths

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

Putting the sockets into temp dirs fixes the problem.
parent 7ba80435
...@@ -200,10 +200,11 @@ func TestUnixSocketProxy(t *testing.T) { ...@@ -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 ...@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment