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

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

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