Browse Source

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>
stable-4.6
David Pursehouse 6 years ago
parent
commit
0f7f3b62ce
  1. 3
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java

3
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.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
/** /**
@ -291,6 +292,7 @@ public class CommitCommandTest extends RepositoryTestCase {
} }
} }
@Ignore("very flaky when run with Hudson")
@Test @Test
public void commitUpdatesSmudgedEntries() throws Exception { public void commitUpdatesSmudgedEntries() throws Exception {
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
@ -347,6 +349,7 @@ public class CommitCommandTest extends RepositoryTestCase {
} }
} }
@Ignore("very flaky when run with Hudson")
@Test @Test
public void commitIgnoresSmudgedEntryWithDifferentId() throws Exception { public void commitIgnoresSmudgedEntryWithDifferentId() throws Exception {
try (Git git = new Git(db)) { try (Git git = new Git(db)) {

Loading…
Cancel
Save