particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testutil: remove unnecessary testutil.MockCmd.Restore()

Browse source 
While looking over the code I noticed that the `Restore()` helper
is not needed (and arguably wrong as it does not reset PATH).
We already use `t.TempDir()` and `t.Setenv()` as part of the
command setup so manually cleanup is not neccessary (and is today
even incomplete). So YAGNI and we can remove Restore().
This commit is contained in:
Michael Vogt 2025-07-16 10:53:52 +02:00
parent 9717980d3f
commit bb45b89d84
4 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/image-builder/main_test.go
View file

@ -378,7 +378,6 @@ func TestBuildIntegrationHappy(t *testing.T) {
script := makeFakeOsbuildScript() script := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script) fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
defer fakeOsbuildCmd.Restore()
var err error var err error
// run inside the tmpdir to validate that the default output dir // run inside the tmpdir to validate that the default output dir
@ -466,7 +465,6 @@ func TestBuildIntegrationArgs(t *testing.T) {
script := makeFakeOsbuildScript() script := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script) fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
defer fakeOsbuildCmd.Restore()
err := main.Run() err := main.Run()
require.NoError(t, err) require.NoError(t, err)
@ -522,8 +520,7 @@ func TestBuildIntegrationErrorsProgressVerbose(t *testing.T) {
}) })
defer restore() defer restore()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild) testutil.MockCommand(t, "osbuild", failingOsbuild)
defer fakeOsbuildCmd.Restore()
var err error var err error
stdout, stderr := testutil.CaptureStdio(t, func() { stdout, stderr := testutil.CaptureStdio(t, func() {
@ -563,8 +560,7 @@ echo "error on stdout"
>&2 echo "error on stderr" >&2 echo "error on stderr"
exit 1 exit 1
` `
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild) testutil.MockCommand(t, "osbuild", failingOsbuild)
defer fakeOsbuildCmd.Restore()
var err error var err error
stdout, _ := testutil.CaptureStdio(t, func() { stdout, _ := testutil.CaptureStdio(t, func() {
@ -611,8 +607,7 @@ func TestBuildIntegrationErrorsProgressTerm(t *testing.T) {
restore = main.MockOsArgs(cmd) restore = main.MockOsArgs(cmd)
defer restore() defer restore()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild) testutil.MockCommand(t, "osbuild", failingOsbuild)
defer fakeOsbuildCmd.Restore()
var err error var err error
stdout, stderr := testutil.CaptureStdio(t, func() { stdout, stderr := testutil.CaptureStdio(t, func() {
@ -867,7 +862,6 @@ func TestBuildCrossArchSmoke(t *testing.T) {
script := makeFakeOsbuildScript() script := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script) fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
defer fakeOsbuildCmd.Restore()
var err error var err error
_, stderr := testutil.CaptureStdio(t, func() { _, stderr := testutil.CaptureStdio(t, func() {
@ -925,8 +919,7 @@ func TestBuildIntegrationOutputFilename(t *testing.T) {
defer restore() defer restore()
script := makeFakeOsbuildScript() script := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script) testutil.MockCommand(t, "osbuild", script)
defer fakeOsbuildCmd.Restore()
err := main.Run() err := main.Run()
assert.NoError(t, err) assert.NoError(t, err)

9
cmd/image-builder/upload_test.go
View file

@ -175,8 +175,7 @@ func TestBuildAndUploadWithAWSMock(t *testing.T) {
outputDir := t.TempDir() outputDir := t.TempDir()
fakeOsbuildScript := makeFakeOsbuildScript() fakeOsbuildScript := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript) testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
defer fakeOsbuildCmd.Restore()
var fakeStdout bytes.Buffer var fakeStdout bytes.Buffer
restore = main.MockOsStdout(&fakeStdout) restore = main.MockOsStdout(&fakeStdout)
@ -224,8 +223,7 @@ func TestBuildAmiButNotUpload(t *testing.T) {
outputDir := t.TempDir() outputDir := t.TempDir()
fakeOsbuildScript := makeFakeOsbuildScript() fakeOsbuildScript := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript) testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
defer fakeOsbuildCmd.Restore()
var fakeStdout bytes.Buffer var fakeStdout bytes.Buffer
restore = main.MockOsStdout(&fakeStdout) restore = main.MockOsStdout(&fakeStdout)
@ -255,8 +253,7 @@ func TestBuildAndUploadWithAWSPartialCmdlineErrors(t *testing.T) {
outputDir := t.TempDir() outputDir := t.TempDir()
fakeOsbuildScript := makeFakeOsbuildScript() fakeOsbuildScript := makeFakeOsbuildScript()
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript) testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
defer fakeOsbuildCmd.Restore()
restore := main.MockOsArgs([]string{ restore := main.MockOsArgs([]string{
"build", "build",

4
internal/testutil/testutil.go
View file

@ -41,10 +41,6 @@ func (mc *MockCmd) Path() string {
return filepath.Join(mc.binDir, mc.name) return filepath.Join(mc.binDir, mc.name)
} }
func (mc *MockCmd) Restore() error {
return os.RemoveAll(mc.binDir)
}
func (mc *MockCmd) Calls() [][]string { func (mc *MockCmd) Calls() [][]string {
b, err := os.ReadFile(mc.Path() + ".run") b, err := os.ReadFile(mc.Path() + ".run")
if os.IsNotExist(err) { if os.IsNotExist(err) {

1
internal/testutil/testutil_test.go
View file

@ -13,7 +13,6 @@ import (
func TestMockCommand(t *testing.T) { func TestMockCommand(t *testing.T) {
fakeCmd := testutil.MockCommand(t, "false", "exit 0") fakeCmd := testutil.MockCommand(t, "false", "exit 0")
defer fakeCmd.Restore()
err := exec.Command("false", "run1-arg1", "run1-arg2").Run() err := exec.Command("false", "run1-arg1", "run1-arg2").Run()
assert.NoError(t, err) assert.NoError(t, err)