diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-27 01:37:29 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-27 01:37:29 +0200 |
| commit | 4451f466e07dfc5a82fba46c4c411847684171b9 (patch) | |
| tree | 00e11cff49d6193d38399a2e6bf07ce85625a264 | |
| parent | 70bc5aad30dca46e086f99f81c80f878d3f54bc6 (diff) | |
| parent | 74a13c7712eaa813d546ec22a301279798b319de (diff) | |
| download | jgit-4451f466e07dfc5a82fba46c4c411847684171b9.tar.gz jgit-4451f466e07dfc5a82fba46c4c411847684171b9.zip | |
Merge branch 'stable-6.0' into stable-6.1
* stable-6.0:
GcConcurrentTest: @Ignore flaky testInterruptGc
Fix CommitTemplateConfigTest
Change-Id: I9c622de39200c6ee248d600736dc5db477f6bf9f
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java index 5f52e6b220..1519873b62 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java @@ -43,6 +43,7 @@ import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; +import org.junit.Ignore; import org.junit.Test; public class GcConcurrentTest extends GcTestCase { @@ -197,6 +198,7 @@ public class GcConcurrentTest extends GcTestCase { assertNotNull(getSinglePack(repository).getBitmapIndex()); } + @Ignore @Test public void testInterruptGc() throws Exception { FileBasedConfig c = repo.getConfig(); |