Skip to content

The Unified and Autonomous Development Platform

fix: Unit test exception

Robin Shenfca2d0a31b74
diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
index ab65723a0a..33f6d5e285 100644
--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java
@@ -11,6 +11,7 @@ import org.eclipse.jgit.api.RmCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
@@ -49,6 +50,12 @@ public abstract class AbstractGitTest extends AppLoaderMocker {
// avoid loading user config
return new FileBasedConfig(new File(getDirectory(), "config"), FS.DETECTED);
}
+
+ @Override
+ public void autoGC(ProgressMonitor monitor) {
+ // MergeCommand triggers autoGC; default background gc can unlock
+ // gc.log.lock after teardown deletes the temp repo.
+ }
});
} catch (IOException e) {