mirror of
https://github.com/kopia/kopia.git
synced 2026-03-27 10:32:08 -04:00
chore(ci): cleanup TestKopiaRunner (#5010)
Remove unnecessary environment variable cleanup in test. Cleanup is done via `t.Setenv(...)` Leverage require in TestKopiaRunner
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestKopiaRunner(t *testing.T) {
|
||||
@@ -11,13 +13,6 @@ func TestKopiaRunner(t *testing.T) {
|
||||
t.Skip("Skipping kopia runner test: 'KOPIA_EXE' is unset")
|
||||
}
|
||||
|
||||
defer func() {
|
||||
envErr := os.Setenv("KOPIA_EXE", origEnv)
|
||||
if envErr != nil {
|
||||
t.Fatal("Unable to reset env KOPIA_EXE to original value")
|
||||
}
|
||||
}()
|
||||
|
||||
for _, tt := range []struct {
|
||||
name string
|
||||
exe string
|
||||
@@ -58,20 +53,24 @@ func TestKopiaRunner(t *testing.T) {
|
||||
t.Setenv("KOPIA_EXE", tt.exe)
|
||||
|
||||
runner, err := NewRunner("")
|
||||
if (err != nil) != tt.expNewRunnerErr {
|
||||
t.Fatalf("Expected NewRunner error: %v, got %v", tt.expNewRunnerErr, err)
|
||||
}
|
||||
if tt.expNewRunnerErr {
|
||||
require.Error(t, err, "expected NewRunner error")
|
||||
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
defer runner.Cleanup()
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Cleanup(runner.Cleanup)
|
||||
|
||||
_, _, err = runner.Run(tt.args...)
|
||||
if (err != nil) != tt.expRunErr {
|
||||
t.Fatalf("Expected Run error: %v, got %v", tt.expRunErr, err)
|
||||
if tt.expRunErr {
|
||||
require.Error(t, err, "expected Run error")
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
require.NoError(t, err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user