Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-06-10 15:45:31 +0000
committerMatthias Sohn2013-06-10 15:45:31 +0000
commit64e95608a6c83016e013884ab6cbcce6af78ecb3 (patch)
tree3651b968890861c483e68d54032d93db9f05f68c /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history
parent7a8a6d77fc9764faf44c447267f1052c2de381c6 (diff)
downloadegit-64e95608a6c83016e013884ab6cbcce6af78ecb3.tar.gz
egit-64e95608a6c83016e013884ab6cbcce6af78ecb3.tar.xz
egit-64e95608a6c83016e013884ab6cbcce6af78ecb3.zip
Ignore test HistoryViewTest.testRebaseAlreadyUpToDate
until we can consume hamcrest 1.3 which is required by SWTBot on Kepler. Bug: 409737 Change-Id: Ib34736350c57bad79e234c9cdc51c9db16e539fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
index f60ffacff..96e0804c1 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/HistoryViewTest.java
@@ -48,6 +48,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -375,6 +376,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
}
@Test
+ @Ignore
public void testRebaseAlreadyUpToDate() throws Exception {
Repository repo = lookupRepository(repoFile);
Ref stable = repo.getRef("stable");
@@ -408,7 +410,7 @@ public class HistoryViewTest extends LocalRepositoryTestCase {
/**
* Workaround to ensure that the TableItem of a SWT table with style
* SWT_VIRTUAL is loaded.
- *
+ *
* @param item
*/
private static void ensureTableItemLoaded(TableItem item) {

Back to the top