Merge branch 'main' into fix/lfs-migration

go-gitea · Dec 12, 2024 · 197314a · 197314a
2 parents 58581b1 + a03fdd9
commit 197314a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
@@ -95,6 +95,11 @@ func TestMain(m *testing.M) {
 	os.Unsetenv("GIT_COMMITTER_EMAIL")
 	os.Unsetenv("GIT_COMMITTER_DATE")
 
+	// Avoid loading the default system config. On MacOS, this config
+	// sets the osxkeychain credential helper, which will cause tests
+	// to freeze with a dialog.
+	os.Setenv("GIT_CONFIG_NOSYSTEM", "true")
+
 	err := unittest.InitFixtures(
 		unittest.FixturesOptions{
 			Dir: filepath.Join(filepath.Dir(setting.AppPath), "models/fixtures/"),