Better, cleaner temp dir handler for testing.

filter/filter_test.go

@@ -8,6 +8,8 @@ import (
 	"reflect"
 	"runtime"
 	"testing"
+
+	"github.com/cortesi/modd/utils"
 )
 
 var filterFilesTests = []struct {
@@ -167,19 +169,8 @@ var findTests = []struct {
 	},
 }
 
-func mustRemoveAll(dir string) {
-	err := os.RemoveAll(dir)
-	if err != nil {
-		panic(err)
-	}
-}
-
 func TestFind(t *testing.T) {
-	d, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("TempDir: %v", err)
-	}
-	defer mustRemoveAll(d)
+	defer utils.WithTempDir(t)()
 	paths := []string{
 		"a/a.test1",
 		"a/b.test2",
@@ -189,7 +180,7 @@ func TestFind(t *testing.T) {
 		"x.test1",
 	}
 	for _, p := range paths {
-		dst := path.Join(d, p)
+		dst := path.Join(".", p)
 		err := os.MkdirAll(path.Dir(dst), 0777)
 		if err != nil {
 			t.Fatalf("Error creating test dir: %v", err)
@@ -201,7 +192,7 @@ func TestFind(t *testing.T) {
 	}
 
 	for i, tt := range findTests {
-		ret, err := Find(d, tt.include, tt.exclude)
+		ret, err := Find(".", tt.include, tt.exclude)
 		if err != nil {
 			t.Fatal(err)
 		}

modd_test.go

@@ -12,19 +12,13 @@ import (
 	"time"
 
 	"github.com/cortesi/modd/conf"
+	"github.com/cortesi/modd/utils"
 	"github.com/cortesi/modd/watch"
 	"github.com/cortesi/termlog"
 )
 
 const timeout = 2 * time.Second
 
-func mustRemoveAll(dir string) {
-	err := os.RemoveAll(dir)
-	if err != nil {
-		panic(err)
-	}
-}
-
 func touch(t *testing.T, p string) {
 	err := ioutil.WriteFile(p, []byte("teststring"), 0777)
 	if err != nil {
@@ -46,17 +40,9 @@ func events(p string) []string {
 }
 
 func _testWatch(t *testing.T, modfunc func(), trigger string, expected []string) {
-	tmpdir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("TempDir: %v", err)
-	}
-	defer mustRemoveAll(tmpdir)
-	err = os.Chdir(tmpdir)
-	if err != nil {
-		t.Fatalf("Chdir: %v", err)
-	}
+	defer utils.WithTempDir(t)()
 
-	err = os.MkdirAll("a", 0777)
+	err := os.MkdirAll("a", 0777)
 	if err != nil {
 		t.Fatal(err)
 	}

utils/utils.go

@@ -0,0 +1,36 @@
+package utils
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+// WithTempDir creates a temp directory, changes the current working directory
+// to it, and returns a function that can be called to clean up. Use it like
+// this:
+//      defer WithTempDir(t)()
+func WithTempDir(t *testing.T) func() {
+	cwd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("TempDir: %v", err)
+	}
+	tmpdir, err := ioutil.TempDir("", "")
+	if err != nil {
+		t.Fatalf("TempDir: %v", err)
+	}
+	err = os.Chdir(tmpdir)
+	if err != nil {
+		t.Fatalf("Chdir: %v", err)
+	}
+	return func() {
+		err := os.Chdir(cwd)
+		if err != nil {
+			t.Fatalf("Chdir: %v", err)
+		}
+		err = os.RemoveAll(tmpdir)
+		if err != nil {
+			t.Fatalf("Removing tmpdir: %s", err)
+		}
+	}
+}

varcmd/varcmd_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/cortesi/modd/conf"
+	"github.com/cortesi/modd/utils"
 	"github.com/cortesi/modd/watch"
 )
 
@@ -54,32 +55,18 @@ func TestRender(t *testing.T) {
 	}
 }
 
-func mustRemoveAll(dir string) {
-	err := os.RemoveAll(dir)
-	if err != nil {
-		panic(err)
-	}
-}
-
 func TestVarCmd(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("TempDir: %v", err)
-	}
-	defer mustRemoveAll(tmpdir)
-	dst := path.Join(tmpdir, "tdir")
-	err = os.MkdirAll(dst, 0777)
+	defer utils.WithTempDir(t)()
+
+	dst := path.Join(".", "tdir")
+	err := os.MkdirAll(dst, 0777)
 	if err != nil {
 		t.Fatalf("MkdirAll: %v", err)
 	}
 	err = ioutil.WriteFile(path.Join(dst, "tfile"), []byte("test"), 0777)
 	if err != nil {
 		t.Fatalf("WriteFile: %v", err)
 	}
-	err = os.Chdir(tmpdir)
-	if err != nil {
-		t.Fatalf("Chdir: %v", err)
-	}
 
 	b := conf.Block{}
 	b.Include = []string{"tdir/**"}