Merge pull request #262 from restic/fix-tests

Fix tests

cmd/restic/integration_fuse_test.go

@@ -57,7 +57,7 @@ func cmdMount(t testing.TB, global GlobalOptions, dir string, ready, done chan s
 	cmd := &CmdMount{global: &global, ready: ready, done: done}
 	OK(t, cmd.Execute([]string{dir}))
 	if TestCleanup {
-		OK(t, os.RemoveAll(dir))
+		RemoveAll(t, dir)
 	}
 }
 
@@ -102,7 +102,7 @@ func TestMount(t *testing.T) {
 		OK(t, err)
 
 		// We remove the mountpoint now to check that cmdMount creates it
-		OK(t, os.RemoveAll(mountpoint))
+		RemoveAll(t, mountpoint)
 
 		ready := make(chan struct{}, 1)
 		done := make(chan struct{})

cmd/restic/integration_helpers_test.go

@@ -183,7 +183,7 @@ func cleanupTempdir(t testing.TB, tempdir string) {
 		return
 	}
 
-	OK(t, os.RemoveAll(tempdir))
+	RemoveAll(t, tempdir)
 }
 
 // withTestEnvironment creates a test environment and calls f with it. After f has
@@ -214,5 +214,5 @@ func withTestEnvironment(t testing.TB, f func(*testEnvironment, GlobalOptions))
 		return
 	}
 
-	OK(t, os.RemoveAll(tempdir))
+	RemoveAll(t, tempdir)
 }