diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-19 21:41:05 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-19 21:41:13 +0900 |
| commit | 0f7f3b62ceb822072ebc8e09598db72e047f67cc (patch) | |
| tree | 36de5bcf267912905fec81e7833eda12d493f77e /org.eclipse.jgit.test/tst/org/eclipse/jgit | |
| parent | 9253a6c5caea9cd95d5839f155c4e9434b16b6ab (diff) | |
| parent | 8223a7e6463fa530602e6c967343c2536ce9aae6 (diff) | |
| download | jgit-0f7f3b62ceb822072ebc8e09598db72e047f67cc.tar.gz jgit-0f7f3b62ceb822072ebc8e09598db72e047f67cc.zip | |
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5:
Temporarily @Ignore flaky CommitCommandTest methods
Change-Id: I2a0e0b63a06f442f5a088d4bc8bb08eaf02ce952
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index 473dce1136..021c245d4e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -76,6 +76,7 @@ import org.eclipse.jgit.submodule.SubmoduleWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.util.FS; +import org.junit.Ignore; import org.junit.Test; /** @@ -291,6 +292,7 @@ public class CommitCommandTest extends RepositoryTestCase { } } + @Ignore("very flaky when run with Hudson") @Test public void commitUpdatesSmudgedEntries() throws Exception { try (Git git = new Git(db)) { @@ -347,6 +349,7 @@ public class CommitCommandTest extends RepositoryTestCase { } } + @Ignore("very flaky when run with Hudson") @Test public void commitIgnoresSmudgedEntryWithDifferentId() throws Exception { try (Git git = new Git(db)) { |