Commit 36f8759
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -746,14 +746,16 @@ func TestFiles(t *testing.T) { | |||
| 746 | 746 | ||
| 747 | 747 | // Create directory / files from test case. | |
| 748 | 748 | if test.fileNames != nil { | |
| 749 | - dirPath, err = ioutil.TempDir(fmt.Sprintf("%s", context.Root), "caddy_test") | ||
| 749 | + dirPath, err = ioutil.TempDir(fmt.Sprintf("%s", context.Root), "caddy_ctxtest") | ||
| 750 | 750 | if err != nil { | |
| 751 | + os.RemoveAll(dirPath) | ||
| 751 | 752 | t.Fatalf(testPrefix+"Expected no error creating directory, got: '%s'", err.Error()) | |
| 752 | 753 | } | |
| 753 | 754 | ||
| 754 | 755 | for _, name := range test.fileNames { | |
| 755 | 756 | absFilePath := filepath.Join(dirPath, name) | |
| 756 | 757 | if err = ioutil.WriteFile(absFilePath, []byte(""), os.ModePerm); err != nil { | |
| 758 | + os.RemoveAll(dirPath) | ||
| 757 | 759 | t.Fatalf(testPrefix+"Expected no error creating file, got: '%s'", err.Error()) | |
| 758 | 760 | } | |
| 759 | 761 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -229,10 +229,11 @@ func TestUnixSocketProxy(t *testing.T) { | |||
| 229 | 229 | })) | |
| 230 | 230 | ||
| 231 | 231 | // Get absolute path for unix: socket | |
| 232 | - dir, err := ioutil.TempDir("", "caddy_test") | ||
| 232 | + dir, err := ioutil.TempDir("", "caddy_proxytest") | ||
| 233 | 233 | if err != nil { | |
| 234 | 234 | t.Fatalf("Failed to make temp dir to contain unix socket. %v", err) | |
| 235 | 235 | } | |
| 236 | + defer os.RemoveAll(dir) | ||
| 236 | 237 | socketPath := filepath.Join(dir, "test_socket") | |
| 237 | 238 | ||
| 238 | 239 | // Change httptest.Server listener to listen to unix: socket | |
@@ -283,28 +284,29 @@ func GetHTTPProxy(messageFormat string, prefix string) (*Proxy, *httptest.Server | |||
| 283 | 284 | return newPrefixedWebSocketTestProxy(ts.URL, prefix), ts | |
| 284 | 285 | } | |
| 285 | 286 | ||
| 286 | - func GetSocketProxy(messageFormat string, prefix string) (*Proxy, *httptest.Server, error) { | ||
| 287 | + func GetSocketProxy(messageFormat string, prefix string) (*Proxy, *httptest.Server, string, error) { | ||
| 287 | 288 | ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | |
| 288 | 289 | fmt.Fprintf(w, messageFormat, r.URL.String()) | |
| 289 | 290 | })) | |
| 290 | 291 | ||
| 291 | - dir, err := ioutil.TempDir("", "caddy_test") | ||
| 292 | + dir, err := ioutil.TempDir("", "caddy_proxytest") | ||
| 292 | 293 | if err != nil { | |
| 293 | - return nil, nil, fmt.Errorf("Failed to make temp dir to contain unix socket. %v", err) | ||
| 294 | + return nil, nil, dir, fmt.Errorf("Failed to make temp dir to contain unix socket. %v", err) | ||
| 294 | 295 | } | |
| 295 | 296 | socketPath := filepath.Join(dir, "test_socket") | |
| 296 | 297 | ||
| 297 | 298 | ln, err := net.Listen("unix", socketPath) | |
| 298 | 299 | if err != nil { | |
| 299 | - return nil, nil, fmt.Errorf("Unable to listen: %v", err) | ||
| 300 | + os.RemoveAll(dir) | ||
| 301 | + return nil, nil, dir, fmt.Errorf("Unable to listen: %v", err) | ||
| 300 | 302 | } | |
| 301 | 303 | ts.Listener = ln | |
| 302 | 304 | ||
| 303 | 305 | ts.Start() | |
| 304 | 306 | ||
| 305 | 307 | tsURL := strings.Replace(ts.URL, "http://", "unix:", 1) | |
| 306 | 308 | ||
| 307 | - return newPrefixedWebSocketTestProxy(tsURL, prefix), ts, nil | ||
| 309 | + return newPrefixedWebSocketTestProxy(tsURL, prefix), ts, dir, nil | ||
| 308 | 310 | } | |
| 309 | 311 | ||
| 310 | 312 | func GetTestServerMessage(p *Proxy, ts *httptest.Server, path string) (string, error) { | |
@@ -370,21 +372,23 @@ func TestUnixSocketProxyPaths(t *testing.T) { | |||
| 370 | 372 | } | |
| 371 | 373 | ||
| 372 | 374 | for _, test := range tests { | |
| 373 | - p, ts, err := GetSocketProxy(greeting, test.prefix) | ||
| 374 | - | ||
| 375 | + p, ts, tmpdir, err := GetSocketProxy(greeting, test.prefix) | ||
| 375 | 376 | if err != nil { | |
| 376 | 377 | t.Fatalf("Getting socket proxy failed - %v", err) | |
| 377 | 378 | } | |
| 378 | 379 | ||
| 379 | 380 | actualMsg, err := GetTestServerMessage(p, ts, test.url) | |
| 380 | 381 | ||
| 381 | 382 | if err != nil { | |
| 383 | + os.RemoveAll(tmpdir) | ||
| 382 | 384 | t.Fatalf("Getting server message failed - %v", err) | |
| 383 | 385 | } | |
| 384 | 386 | ||
| 385 | 387 | if actualMsg != test.expected { | |
| 386 | 388 | t.Errorf("Expected '%s' but got '%s' instead", test.expected, actualMsg) | |
| 387 | 389 | } | |
| 390 | + | ||
| 391 | + os.RemoveAll(tmpdir) | ||
| 388 | 392 | } | |
| 389 | 393 | } | |
| 390 | 394 | ||
0 commit comments