diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-20 16:07:48 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-20 16:07:55 +0900 |
| commit | f5b25bcad344b12fd0cb87b72a98d6e07d65833d (patch) | |
| tree | 781a4a947e0217786c133e6c80f62bffa56effe9 | |
| parent | d5ff94d57533c885ab1e2c41123229d09dbe1834 (diff) | |
| parent | bb5dab961344e58ea6c211a73f735f4e8265580b (diff) | |
| download | jgit-f5b25bcad344b12fd0cb87b72a98d6e07d65833d.tar.gz jgit-f5b25bcad344b12fd0cb87b72a98d6e07d65833d.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Temporarily @Ignore flaky CommitCommandTest methods
Change-Id: I016c9b3ec0081542bb903f361d9a3af1ea746ae3
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -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 7e657e64af..37fee402e9 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; /** @@ -305,6 +306,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)) { @@ -361,6 +363,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)) { |