Rename timeoutError, try to deflake cmd test

Author: sdboyer

internal/gps/cmd.go

@@ -26,9 +26,9 @@ type monitoredCmd struct {
 	stderr  *activityBuffer
 }
 
-// timeoutError indicates that the monitored process was terminated due to
-// exceeding activity timeouts.
-type timeoutError struct {
+// noProgressError indicates that the monitored process was terminated due to
+// exceeding exceeding the progress timeout.
+type noProgressError struct {
 	timeout time.Duration
 }
 
@@ -92,7 +92,7 @@ selloop:
 				if err := killProcess(c.cmd, isDone); err != nil {
 					killerr = &killCmdError{err}
 				} else {
-					killerr = &timeoutError{c.timeout}
+					killerr = &noProgressError{c.timeout}
 				}
 				break selloop
 			}
@@ -161,7 +161,7 @@ func (b *activityBuffer) lastActivity() time.Time {
 	return b.lastActivityStamp
 }
 
-func (e timeoutError) Error() string {
+func (e noProgressError) Error() string {
 	return fmt.Sprintf("command killed after %s of no activity", e.timeout)
 }
 

internal/gps/cmd_test.go

@@ -16,7 +16,7 @@ import (
 func mkTestCmd(iterations int) *monitoredCmd {
 	return newMonitoredCmd(
 		exec.Command("./echosleep", "-n", fmt.Sprint(iterations)),
-		500*time.Millisecond,
+		490*time.Millisecond,
 	)
 }
 
@@ -49,7 +49,7 @@ func TestMonitoredCmd(t *testing.T) {
 		t.Error("Expected command to fail")
 	}
 
-	_, ok := err.(*timeoutError)
+	_, ok := err.(*noProgressError)
 	if !ok {
 		t.Errorf("Expected a timeout error, but got: %s", err)
 	}