diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-20 16:06:44 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-06-20 16:06:54 +0900 |
| commit | bb5dab961344e58ea6c211a73f735f4e8265580b (patch) | |
| tree | 02389785a102996eac1466b07e275dd917d400f4 /org.eclipse.jgit.test/tst/org/eclipse/jgit | |
| parent | 1887c834772d9e035b50ebda4922aa5c8159a31f (diff) | |
| parent | 0f7f3b62ceb822072ebc8e09598db72e047f67cc (diff) | |
| download | jgit-bb5dab961344e58ea6c211a73f735f4e8265580b.tar.gz jgit-bb5dab961344e58ea6c211a73f735f4e8265580b.zip | |
Merge branch 'stable-4.6' into stable-4.7
* stable-4.6:
Temporarily @Ignore flaky CommitCommandTest methods
Change-Id: Idc653c22a9af2013a4c481bb19ca8d059f5c34d0
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 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)) { |