Browse Source

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>
stable-4.8
David Pursehouse 6 years ago
parent
commit
f5b25bcad3
  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.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)) {

Loading…
Cancel
Save