Fix intermittent "zombie" process creation

These processes weren't actually zombies at all, they were still running fine -
just outliving their parents as they were never given an interrupt signal in
the timeout case.

1 files changed, 7 insertions, 4 deletions

diff --git a/helpers_test.go b/helpers_test.go
index dd74fca1..e4fec847 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -210,18 +210,21 @@ func runPagesProcess(t *testing.T, wait bool, pagesPath string, listeners []List
 		close(waitCh)
 	}()
 
+	cleanup := func() {
+		cmd.Process.Signal(os.Interrupt)
+		<-waitCh
+	}
+
 	if wait {
 		for _, spec := range listeners {
 			if err := spec.WaitUntilRequestSucceeds(waitCh); err != nil {
+				cleanup()
 				t.Fatal(err)
 			}
 		}
 	}
 
-	return func() {
-		cmd.Process.Signal(os.Interrupt)
-		<-waitCh
-	}
+	return cleanup
 }
 
 func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraArgs []string) (args, tempfiles []string) {