Merge pull request #274 from artemvmin/concurrent-fake-exec

Make FakeExec safe for concurrency

Author: k8s-ci-robot

exec/testing/fake_exec.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"sync"
 
 	"k8s.io/utils/exec"
 )
@@ -32,30 +33,28 @@ type FakeExec struct {
 	// ExactOrder enforces that commands are called in the order they are scripted,
 	// and with the exact same arguments
 	ExactOrder bool
-	// DisableScripts removes the requirement that a slice of FakeCommandAction be
-	// populated before calling Command(). This makes the fakeexec (and subsequent
-	// calls to Run() or CombinedOutput() always return success and there is no
-	// ability to set their output.
+	// DisableScripts removes the requirement that CommandScripts be populated
+	// before calling Command(). This makes Command() and subsequent calls to
+	// Run() or CombinedOutput() always return success and empty output.
 	DisableScripts bool
+
+	mu sync.Mutex
 }
 
 var _ exec.Interface = &FakeExec{}
 
 // FakeCommandAction is the function to be executed
 type FakeCommandAction func(cmd string, args ...string) exec.Cmd
 
-// Command is to track the commands that are executed
+// Command returns the next unexecuted command in CommandScripts.
+// This function is safe for concurrent access as long as the underlying
+// FakeExec struct is not modified during execution.
 func (fake *FakeExec) Command(cmd string, args ...string) exec.Cmd {
 	if fake.DisableScripts {
 		fakeCmd := &FakeCmd{DisableScripts: true}
 		return InitFakeCmd(fakeCmd, cmd, args...)
 	}
-	if fake.CommandCalls > len(fake.CommandScript)-1 {
-		panic(fmt.Sprintf("ran out of Command() actions. Could not handle command [%d]: %s args: %v", fake.CommandCalls, cmd, args))
-	}
-	i := fake.CommandCalls
-	fake.CommandCalls++
-	fakeCmd := fake.CommandScript[i](cmd, args...)
+	fakeCmd := fake.nextCommand(cmd, args)
 	if fake.ExactOrder {
 		argv := append([]string{cmd}, args...)
 		fc := fakeCmd.(*FakeCmd)
@@ -74,6 +73,18 @@ func (fake *FakeExec) Command(cmd string, args ...string) exec.Cmd {
 	return fakeCmd
 }
 
+func (fake *FakeExec) nextCommand(cmd string, args []string) exec.Cmd {
+	fake.mu.Lock()
+	defer fake.mu.Unlock()
+
+	if fake.CommandCalls > len(fake.CommandScript)-1 {
+		panic(fmt.Sprintf("ran out of Command() actions. Could not handle command [%d]: %s args: %v", fake.CommandCalls, cmd, args))
+	}
+	i := fake.CommandCalls
+	fake.CommandCalls++
+	return fake.CommandScript[i](cmd, args...)
+}
+
 // CommandContext wraps arguments into exec.Cmd
 func (fake *FakeExec) CommandContext(ctx context.Context, cmd string, args ...string) exec.Cmd {
 	return fake.Command(cmd, args...)