Merge pull request #779 from ibrasho-forks/resolve-possible-race-in-activityBuffer

internal/gps: Resolve possible race in gps.activityBuffer

Author: sdboyer

internal/gps/cmd.go

@@ -127,11 +127,11 @@ func (c *monitoredCmd) hasTimedOut() bool {
 
 func (c *monitoredCmd) combinedOutput(ctx context.Context) ([]byte, error) {
 	if err := c.run(ctx); err != nil {
-		return c.stderr.buf.Bytes(), err
+		return c.stderr.Bytes(), err
 	}
 
 	// FIXME(sdboyer) this is not actually combined output
-	return c.stdout.buf.Bytes(), nil
+	return c.stdout.Bytes(), nil
 }
 
 // activityBuffer is a buffer that keeps track of the last time a Write
@@ -150,14 +150,31 @@ func newActivityBuffer() *activityBuffer {
 
 func (b *activityBuffer) Write(p []byte) (int, error) {
 	b.Lock()
-	b.lastActivityStamp = time.Now()
 	defer b.Unlock()
+
+	b.lastActivityStamp = time.Now()
+
 	return b.buf.Write(p)
 }
 
+func (b *activityBuffer) String() string {
+	b.Lock()
+	defer b.Unlock()
+
+	return b.buf.String()
+}
+
+func (b *activityBuffer) Bytes() []byte {
+	b.Lock()
+	defer b.Unlock()
+
+	return b.buf.Bytes()
+}
+
 func (b *activityBuffer) lastActivity() time.Time {
 	b.Lock()
 	defer b.Unlock()
+
 	return b.lastActivityStamp
 }
 

internal/gps/cmd_test.go

@@ -32,49 +32,60 @@ func TestMonitoredCmd(t *testing.T) {
 	}
 	defer os.Remove("./echosleep")
 
-	cmd := mkTestCmd(2)
-	err = cmd.run(context.Background())
-	if err != nil {
-		t.Errorf("Expected command not to fail: %s", err)
+	tests := []struct {
+		name       string
+		iterations int
+		output     string
+		err        bool
+		timeout    bool
+	}{
+		{"success", 2, "foo\nfoo\n", false, false},
+		{"timeout", 5, "foo\nfoo\nfoo\nfoo\n", true, true},
 	}
 
-	expectedOutput := "foo\nfoo\n"
-	if cmd.stdout.buf.String() != expectedOutput {
-		t.Errorf("Unexpected output:\n\t(GOT): %s\n\t(WNT): %s", cmd.stdout.buf.String(), expectedOutput)
-	}
+	for _, want := range tests {
+		t.Run(want.name, func(t *testing.T) {
+			cmd := mkTestCmd(want.iterations)
 
-	cmd2 := mkTestCmd(10)
-	err = cmd2.run(context.Background())
-	if err == nil {
-		t.Error("Expected command to fail")
-	}
+			err := cmd.run(context.Background())
+			if !want.err && err != nil {
+				t.Errorf("Eexpected command not to fail, got error: %s", err)
+			} else if want.err && err == nil {
+				t.Error("expected command to fail")
+			}
 
-	_, ok := err.(*noProgressError)
-	if !ok {
-		t.Errorf("Expected a timeout error, but got: %s", err)
-	}
+			got := cmd.stdout.String()
+			if want.output != got {
+				t.Errorf("unexpected output:\n\t(GOT):\n%s\n\t(WNT):\n%s", got, want.output)
+			}
 
-	expectedOutput = "foo\nfoo\nfoo\nfoo\n"
-	if cmd2.stdout.buf.String() != expectedOutput {
-		t.Errorf("Unexpected output:\n\t(GOT): %s\n\t(WNT): %s", cmd2.stdout.buf.String(), expectedOutput)
+			if want.timeout {
+				_, ok := err.(*noProgressError)
+				if !ok {
+					t.Errorf("Expected a timeout error, but got: %s", err)
+				}
+			}
+		})
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	sync1, errchan := make(chan struct{}), make(chan error)
-	cmd3 := mkTestCmd(2)
-	go func() {
-		close(sync1)
-		errchan <- cmd3.run(ctx)
-	}()
+	t.Run("cancel", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(context.Background())
+		sync, errchan := make(chan struct{}), make(chan error)
+		cmd := mkTestCmd(2)
+		go func() {
+			close(sync)
+			errchan <- cmd.run(ctx)
+		}()
 
-	// Make sure goroutine is at least started before we cancel the context.
-	<-sync1
-	// Give it a bit to get the process started.
-	<-time.After(5 * time.Millisecond)
-	cancel()
+		// Make sure goroutine is at least started before we cancel the context.
+		<-sync
+		// Give it a bit to get the process started.
+		<-time.After(5 * time.Millisecond)
+		cancel()
 
-	err = <-errchan
-	if err != context.Canceled {
-		t.Errorf("should have gotten canceled error, got %s", err)
-	}
+		err := <-errchan
+		if err != context.Canceled {
+			t.Errorf("expected a canceled error, got %s", err)
+		}
+	})
 }