diff --git a/cmd/configure/configure_test.go b/cmd/configure/configure_test.go index c8ae08f0..e6b544f9 100644 --- a/cmd/configure/configure_test.go +++ b/cmd/configure/configure_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/databricks/bricks/cmd/root" - "github.com/databricks/bricks/tests" "github.com/stretchr/testify/assert" "gopkg.in/ini.v1" ) @@ -25,8 +24,8 @@ func setup(t *testing.T) string { if runtime.GOOS == "windows" { homeEnvVar = "USERPROFILE" } - tests.SetTestEnv(t, homeEnvVar, tempHomeDir) - tests.SetTestEnv(t, "DATABRICKS_CONFIG_FILE", "") + t.Setenv(homeEnvVar, tempHomeDir) + t.Setenv("DATABRICKS_CONFIG_FILE", "") return tempHomeDir } @@ -74,7 +73,7 @@ func TestConfigFileFromEnvNoInteractive(t *testing.T) { ctx := context.Background() tempHomeDir := setup(t) cfgFileDir := filepath.Join(tempHomeDir, "test") - tests.SetTestEnv(t, "DATABRICKS_CONFIG_FILE", cfgFileDir) + t.Setenv("DATABRICKS_CONFIG_FILE", cfgFileDir) inp := getTempFileWithContent(t, tempHomeDir, "token\n") oldStdin := os.Stdin diff --git a/tests/utils.go b/tests/utils.go deleted file mode 100644 index 6e118bc3..00000000 --- a/tests/utils.go +++ /dev/null @@ -1,23 +0,0 @@ -package tests - -import ( - "os" - "testing" - - "github.com/stretchr/testify/assert" -) - -func SetTestEnv(t *testing.T, key, value string) { - originalValue, isSet := os.LookupEnv(key) - - err := os.Setenv(key, value) - assert.NoError(t, err) - - t.Cleanup(func() { - if isSet { - os.Setenv(key, originalValue) - } else { - os.Unsetenv(key) - } - }) -}