Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2018-06-20 07:06:44 +0000
committerDavid Pursehouse2018-06-20 07:06:54 +0000
commitbb5dab961344e58ea6c211a73f735f4e8265580b (patch)
tree02389785a102996eac1466b07e275dd917d400f4 /org.eclipse.jgit.test/tst
parent1887c834772d9e035b50ebda4922aa5c8159a31f (diff)
parent0f7f3b62ceb822072ebc8e09598db72e047f67cc (diff)
downloadjgit-bb5dab961344e58ea6c211a73f735f4e8265580b.tar.gz
jgit-bb5dab961344e58ea6c211a73f735f4e8265580b.tar.xz
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')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java3
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)) {

Back to the top