jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: use T.TempDir to create temporary test directory (#30803)

Browse Source 
This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Prior to this commit, temporary directory created using `ioutil.TempDir`
needs to be removed manually by calling `os.RemoveAll`, which is omitted
in some tests. The error handling boilerplate e.g.
	defer func() {
		if err := os.RemoveAll(dir); err != nil {
			t.Fatal(err)
		}
	}
is also tedious, but `t.TempDir` handles this for us nicely.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2022-04-09 00:34:16 +08:00
committed by GitHub
parent 5b615882e2
commit fedd315275
66 changed files with 373 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/command/show_test.go
View File

@@ -69,8 +69,7 @@ func TestShow_noArgsNoState(t *testing.T) {
func TestShow_noArgsWithState(t *testing.T) {
// Get a temp cwd
tmp, cwd := testCwd(t)
defer testFixCwd(t, tmp, cwd)
testCwd(t)
// Create the default state
testStateFileDefault(t, testState())
@@ -484,10 +483,9 @@ func TestShow_json_output(t *testing.T) {
}
t.Run(entry.Name(), func(t *testing.T) {
td := tempDir(t)
td := t.TempDir()
inputDir := filepath.Join(fixtureDir, entry.Name())
testCopyDir(t, inputDir, td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
expectError := strings.Contains(entry.Name(), "error")
@@ -588,10 +586,9 @@ func TestShow_json_output(t *testing.T) {
}
func TestShow_json_output_sensitive(t *testing.T) {
td := tempDir(t)
td := t.TempDir()
inputDir := "testdata/show-json-sensitive"
testCopyDir(t, inputDir, td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
providerSource, close := newMockProviderSource(t, map[string][]string{"test": {"1.2.3"}})
@@ -682,10 +679,9 @@ func TestShow_json_output_sensitive(t *testing.T) {
// Failing conditions are only present in JSON output for refresh-only plans,
// so we test that separately here.
func TestShow_json_output_conditions_refresh_only(t *testing.T) {
td := tempDir(t)
td := t.TempDir()
inputDir := "testdata/show-json/conditions"
testCopyDir(t, inputDir, td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
providerSource, close := newMockProviderSource(t, map[string][]string{"test": {"1.2.3"}})
@@ -790,10 +786,9 @@ func TestShow_json_output_state(t *testing.T) {
}
t.Run(entry.Name(), func(t *testing.T) {
td := tempDir(t)
td := t.TempDir()
inputDir := filepath.Join(fixtureDir, entry.Name())
testCopyDir(t, inputDir, td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
providerSource, close := newMockProviderSource(t, map[string][]string{
@@ -865,9 +860,8 @@ func TestShow_json_output_state(t *testing.T) {
func TestShow_planWithNonDefaultStateLineage(t *testing.T) {
// Create a temporary working directory that is empty
td := tempDir(t)
td := t.TempDir()
testCopyDir(t, testFixturePath("show"), td)
defer os.RemoveAll(td)
defer testChdir(t, td)()
// Write default state file with a testing lineage ("fake-for-testing")