use t.Chdir, fix test env ordering

Author: sofuture

main_test.go

@@ -68,18 +68,14 @@ func TestLoadEnvFiles(t *testing.T) {
 		}
 
 		env := os.Environ()
-		os.Clearenv()
 
-		err = os.Chdir("fixtures/loadEnvFiles")
-		if err != nil {
-			t.Fatal(err)
-		}
+		t.Chdir("fixtures/loadEnvFiles")
+
+		// Clear environment after t.Chdir because t.Chdir sets PWD
+		os.Clearenv()
 
 		t.Cleanup(func() {
-			err := os.Chdir(cwd)
-			if err != nil {
-				t.Fatal(err)
-			}
+			t.Chdir(cwd)
 
 			os.Clearenv()
 

pkg/dbmate/db_test.go

@@ -40,8 +40,7 @@ func newTestDB(t *testing.T, u *url.URL) *dbmate.DB {
 		require.NoError(t, err)
 	}
 
-	err = os.Chdir(rootDir + "/testdata")
-	require.NoError(t, err)
+	t.Chdir(rootDir + "/testdata")
 
 	db := dbmate.New(u)
 	db.AutoDumpSchema = false