diff --git a/cmd/image-builder/main_test.go b/cmd/image-builder/main_test.go index 5263de7..66ca06c 100644 --- a/cmd/image-builder/main_test.go +++ b/cmd/image-builder/main_test.go @@ -392,8 +392,8 @@ centos-9-qcow2-x86_64/centos-9-qcow2-x86_64.qcow2 `) // ensure osbuild was run exactly one - require.Equal(t, 1, len(fakeOsbuildCmd.Calls())) - osbuildCall := fakeOsbuildCmd.Calls()[0] + require.Equal(t, 1, len(fakeOsbuildCmd.CallArgsList())) + osbuildCall := fakeOsbuildCmd.CallArgsList()[0] // --cache is passed correctly to osbuild storePos := slices.Index(osbuildCall, "--store") assert.True(t, storePos > -1) @@ -470,7 +470,7 @@ func TestBuildIntegrationArgs(t *testing.T) { require.NoError(t, err) // ensure output dir override works - osbuildCall := fakeOsbuildCmd.Calls()[0] + osbuildCall := fakeOsbuildCmd.CallArgsList()[0] outputDirPos := slices.Index(osbuildCall, "--output-directory") assert.True(t, outputDirPos > -1) assert.Equal(t, outputDir, osbuildCall[outputDirPos+1]) diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go index 65f2ff1..cfd83b5 100644 --- a/internal/testutil/testutil.go +++ b/internal/testutil/testutil.go @@ -41,7 +41,7 @@ func (mc *MockCmd) Path() string { return filepath.Join(mc.binDir, mc.name) } -func (mc *MockCmd) Calls() [][]string { +func (mc *MockCmd) CallArgsList() [][]string { b, err := os.ReadFile(mc.Path() + ".run") if os.IsNotExist(err) { return nil @@ -49,15 +49,15 @@ func (mc *MockCmd) Calls() [][]string { if err != nil { panic(err) } - var calls [][]string + var callArgsList [][]string for _, line := range strings.Split(string(b), "\n") { if line == "" { continue } call := strings.Split(line, "\000") - calls = append(calls, call[0:len(call)-1]) + callArgsList = append(callArgsList, call[0:len(call)-1]) } - return calls + return callArgsList } // CaptureStdio runs the given function f() in an environment that diff --git a/internal/testutil/testutil_test.go b/internal/testutil/testutil_test.go index 020baf0..b833696 100644 --- a/internal/testutil/testutil_test.go +++ b/internal/testutil/testutil_test.go @@ -22,7 +22,7 @@ func TestMockCommand(t *testing.T) { assert.Equal(t, [][]string{ {"run1-arg1", "run1-arg2"}, {"run2-arg1", "run2-arg2"}, - }, fakeCmd.Calls()) + }, fakeCmd.CallArgsList()) } func TestCaptureStdout(t *testing.T) {