Make less flakey

keybase · May 24, 2016 · acac3e0 · acac3e0
1 parent 19e1786
commit acac3e0
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/process/process_nix_test.go b/process/process_nix_test.go
@@ -20,17 +20,20 @@ func TestFindProcessWait(t *testing.T) {
 	procPath := procPath(t)
 	cmd := exec.Command(procPath, "10")
 	defer cleanupProc(cmd, procPath)
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		err := cmd.Start()
-		require.NoError(t, err)
-	}()
+
+	// Ensure it's not already running
 	procs, err := FindProcesses(NewMatcher(procPath, PathEqual, testLog), time.Millisecond, 0, testLog)
 	require.NoError(t, err)
 	require.Equal(t, 0, len(procs))
 
+	go func() {
+		time.Sleep(10 * time.Millisecond)
+		startErr := cmd.Start()
+		require.NoError(t, startErr)
+	}()
+
 	// Wait up to second for process to be running
-	procs, err = FindProcesses(NewMatcher(procPath, PathEqual, testLog), time.Second, 0, testLog)
+	procs, err = FindProcesses(NewMatcher(procPath, PathEqual, testLog), time.Second, 10*time.Millisecond, testLog)
 	require.NoError(t, err)
 	require.True(t, len(procs) == 1)
 }