Commit bbddde9f authored by Jacob Vosmaer's avatar Jacob Vosmaer

Remove path without process cleanup

parent 1a4272eb
...@@ -24,7 +24,11 @@ func TestAllowedClone(t *testing.T) { ...@@ -24,7 +24,11 @@ func TestAllowedClone(t *testing.T) {
fmt.Fprintln(w, `{"GL_ID":"user-123"}`) fmt.Fprintln(w, `{"GL_ID":"user-123"}`)
})) }))
defer ts.Close() defer ts.Close()
defer cleanUpProcessGroup(startServer(t, ts)) cmd, err := startServer(ts)
if err != nil {
t.Fatal(err)
}
defer cleanUpProcessGroup(cmd)
if err := os.RemoveAll(scratchDir); err != nil { if err := os.RemoveAll(scratchDir); err != nil {
t.Fatal(err) t.Fatal(err)
} }
...@@ -35,13 +39,13 @@ func TestAllowedClone(t *testing.T) { ...@@ -35,13 +39,13 @@ func TestAllowedClone(t *testing.T) {
} }
} }
func startServer(t *testing.T, ts *httptest.Server) (cmd *exec.Cmd) { func startServer(ts *httptest.Server) (cmd *exec.Cmd, err error) {
var conn net.Conn var conn net.Conn
var err error
cmd = exec.Command("go", "run", "main.go", fmt.Sprintf("-authBackend=%s", ts.URL), fmt.Sprintf("-listenAddr=%s", servAddr), testRepoRoot) cmd = exec.Command("go", "run", "main.go", fmt.Sprintf("-authBackend=%s", ts.URL), fmt.Sprintf("-listenAddr=%s", servAddr), testRepoRoot)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
if err := cmd.Start(); err != nil { err = cmd.Start()
t.Fatal(err) if err != nil {
return
} }
for i := 0; i < servWaitListen/servWaitSleep; i++ { for i := 0; i < servWaitListen/servWaitSleep; i++ {
conn, err = net.Dial("tcp", servAddr) conn, err = net.Dial("tcp", servAddr)
...@@ -51,8 +55,5 @@ func startServer(t *testing.T, ts *httptest.Server) (cmd *exec.Cmd) { ...@@ -51,8 +55,5 @@ func startServer(t *testing.T, ts *httptest.Server) (cmd *exec.Cmd) {
} }
time.Sleep(servWaitSleep * time.Millisecond) time.Sleep(servWaitSleep * time.Millisecond)
} }
if err != nil {
t.Fatal(err)
}
return return
} }
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