diff options
| author | Matthias Sohn | 2023-04-26 23:07:47 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2023-04-26 23:35:59 +0000 |
| commit | 74a13c7712eaa813d546ec22a301279798b319de (patch) | |
| tree | dacf9cd17d8242a244f1812340531dee8d7fd9b0 | |
| parent | 9445e42b7a79771dd69a55edacb11f30c499ae86 (diff) | |
| parent | 2fd050c5674a08f1a5ccbe6b6cfc922ce6144c4a (diff) | |
| download | jgit-74a13c7712eaa813d546ec22a301279798b319de.tar.gz jgit-74a13c7712eaa813d546ec22a301279798b319de.tar.xz jgit-74a13c7712eaa813d546ec22a301279798b319de.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
GcConcurrentTest: @Ignore flaky testInterruptGc
Fix CommitTemplateConfigTest
Adapt GcConcurrentTest to changed FileRepositoryBuilder API.
Change-Id: I8906662a6391ceed20ab29cfbe238daf13e1be63
| -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(); |