lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filch_test: clarify the use of os.RemoveAll(). 

Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
pull/418/head
Avery Pennarun 2020-05-27 18:50:14 -04:00
parent afb9c6a6ab
commit 5eb09c8f5e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
logtail/filch/filch_test.go
View File

@ -56,18 +56,18 @@ func (f *filchTest) close(t *testing.T) {
} }
} }
func genFilePrefix(t *testing.T) string { func genFilePrefix(t *testing.T) (dir, prefix string) {
t.Helper() t.Helper()
filePrefix, err := ioutil.TempDir("", "filch") dir, err := ioutil.TempDir("", "filch")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
return filepath.Join(filePrefix, "ringbuffer-") return dir, filepath.Join(dir, "ringbuffer-")
} }
func TestQueue(t *testing.T) { func TestQueue(t *testing.T) {
filePrefix := genFilePrefix(t) td, filePrefix := genFilePrefix(t)
defer os.RemoveAll(filepath.Dir(filePrefix)) defer os.RemoveAll(td)
f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false}) f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false})
@ -90,8 +90,8 @@ func TestQueue(t *testing.T) {
func TestRecover(t *testing.T) { func TestRecover(t *testing.T) {
t.Run("empty", func(t *testing.T) { t.Run("empty", func(t *testing.T) {
filePrefix := genFilePrefix(t) td, filePrefix := genFilePrefix(t)
defer os.RemoveAll(filepath.Dir(filePrefix)) defer os.RemoveAll(td)
f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false}) f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false})
f.write(t, "hello") f.write(t, "hello")
f.read(t, "hello") f.read(t, "hello")
@ -104,8 +104,8 @@ func TestRecover(t *testing.T) {
}) })
t.Run("cur", func(t *testing.T) { t.Run("cur", func(t *testing.T) {
filePrefix := genFilePrefix(t) td, filePrefix := genFilePrefix(t)
defer os.RemoveAll(filepath.Dir(filePrefix)) defer os.RemoveAll(td)
f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false}) f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false})
f.write(t, "hello") f.write(t, "hello")
f.close(t) f.close(t)
@ -123,8 +123,8 @@ func TestRecover(t *testing.T) {
filch_test.go:129: r.ReadLine()="hello", want "world" filch_test.go:129: r.ReadLine()="hello", want "world"
*/ */
filePrefix := genFilePrefix(t) td, filePrefix := genFilePrefix(t)
defer os.RemoveAll(filepath.Dir(filePrefix)) defer os.RemoveAll(td)
f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false}) f := newFilchTest(t, filePrefix, Options{ReplaceStderr: false})
f.write(t, "hello") f.write(t, "hello")
f.read(t, "hello") f.read(t, "hello")
@ -155,8 +155,8 @@ func TestFilchStderr(t *testing.T) {
stderrFD = 2 stderrFD = 2
}() }()
filePrefix := genFilePrefix(t) td, filePrefix := genFilePrefix(t)
defer os.RemoveAll(filepath.Dir(filePrefix)) defer os.RemoveAll(td)
f := newFilchTest(t, filePrefix, Options{ReplaceStderr: true}) f := newFilchTest(t, filePrefix, Options{ReplaceStderr: true})
f.write(t, "hello") f.write(t, "hello")
if _, err := fmt.Fprintf(pipeW, "filch\n"); err != nil { if _, err := fmt.Fprintf(pipeW, "filch\n"); err != nil {