Skip to content

Commit 8f047d9

Browse files
authored
Codex/fix require no error (#472)
* require.NoErrorに統一 * defer内も * test内でdeferは辞める
1 parent df553ed commit 8f047d9

1 file changed

Lines changed: 19 additions & 35 deletions

File tree

main_test.go

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,14 @@ resource "AAA" "aaa" {
2020
}`)
2121
tmpDir := t.TempDir()
2222

23-
if err := os.WriteFile(filepath.Join(tmpDir, filename), input, 0644); err != nil {
24-
t.Fatal(err)
25-
}
23+
err := os.WriteFile(filepath.Join(tmpDir, filename), input, 0644)
24+
require.NoError(t, err)
2625

2726
root, err := os.OpenRoot(tmpDir)
28-
if err != nil {
29-
t.Fatal(err)
30-
}
31-
defer func(root *os.Root) {
32-
if closeErr := root.Close(); closeErr != nil {
33-
t.Fatal(closeErr)
34-
}
35-
}(root)
27+
require.NoError(t, err)
28+
t.Cleanup(func() {
29+
require.NoError(t, root.Close())
30+
})
3631

3732
got, err := readTFFile(root, filename)
3833
require.NoError(t, err)
@@ -85,13 +80,11 @@ moved {
8580
setup: func(tmpDir string, dirName string, filename string) {
8681
symLinkDir := filepath.Join(tmpDir, "sym-link-dir")
8782

88-
if err := os.Mkdir(symLinkDir, 0755); err != nil {
89-
t.Fatal(err)
90-
}
83+
err := os.Mkdir(symLinkDir, 0755)
84+
require.NoError(t, err)
9185

92-
if err := os.Symlink(filepath.Join("..", dirName, filename), filepath.Join(symLinkDir, filename)); err != nil {
93-
t.Fatal(err)
94-
}
86+
err = os.Symlink(filepath.Join("..", dirName, filename), filepath.Join(symLinkDir, filename))
87+
require.NoError(t, err)
9588
},
9689
expected: []byte(
9790
`
@@ -120,40 +113,31 @@ resource "AAA" "aaa" {
120113
dirName := "main-dir"
121114
fileDir := filepath.Join(tmpDir, dirName)
122115

123-
if err := os.Mkdir(fileDir, 0755); err != nil {
124-
t.Fatal(err)
125-
}
116+
err := os.Mkdir(fileDir, 0755)
117+
require.NoError(t, err)
126118

127119
filePath := filepath.Join(fileDir, filename)
128120

129-
if err := os.WriteFile(filePath, tt.args.input, 0644); err != nil {
130-
t.Fatal(err)
131-
}
121+
err = os.WriteFile(filePath, tt.args.input, 0644)
122+
require.NoError(t, err)
132123

133124
tt.setup(tmpDir, dirName, filename)
134125

135126
origDir, err := os.Getwd()
136-
if err != nil {
137-
t.Fatal(err)
138-
}
127+
require.NoError(t, err)
139128

140-
if err = os.Chdir(tmpDir); err != nil {
141-
t.Fatal(err)
142-
}
129+
err = os.Chdir(tmpDir)
130+
require.NoError(t, err)
143131

144132
t.Cleanup(func() {
145-
if chErr := os.Chdir(origDir); chErr != nil {
146-
t.Fatal(chErr)
147-
}
133+
require.NoError(t, os.Chdir(origDir))
148134
})
149135

150136
err = run()
151137
require.NoError(t, err)
152138

153139
got, err := os.ReadFile(filePath)
154-
if err != nil {
155-
t.Fatal(err)
156-
}
140+
require.NoError(t, err)
157141

158142
require.Equal(t, string(tt.expected), string(got))
159143
})

0 commit comments

Comments
 (0)