making sure to lock when touching the promise.cmd property

Tonkpils · Jan 29, 2016 · 845f674 · 845f674
1 parent 309c670
commit 845f674
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/vow/promise.go b/vow/promise.go
@@ -116,7 +116,9 @@ func (p *promise) Run(w io.Writer, verbose bool) (err error) {
 }
 
 func (p *promise) wait(w io.Writer, verbose bool, buf *syncBuffer) error {
+	p.cmdMtx.Lock()
 	err := p.cmd.Wait()
+	p.cmdMtx.Unlock()
 
 	status := statusPassed
 	if err != nil {

diff --git a/vow/to_test.go b/vow/to_test.go
@@ -78,9 +78,11 @@ func TestStopAsync(t *testing.T) {
 	<-time.After(10 * time.Millisecond)
 
 	vow.Stop()
-	for _, cmd := range vow.cmds {
-		cmd.cmd.Wait()
-		assert.True(t, cmd.cmd.ProcessState.Exited())
+	for _, p := range vow.cmds {
+		p.cmdMtx.Lock()
+		p.cmd.Wait()
+		assert.True(t, p.cmd.ProcessState.Exited())
+		p.cmdMtx.Unlock()
 	}
 }