Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2013-01-31 03:35:21 -0500
committerLaurent Goubet2013-01-31 03:35:21 -0500
commitdc773c407d3f20b949e50cea8bdb9e314b9d4310 (patch)
tree742775dba3145286e3803209d5d85122dbe7fa53
parent174298888460c06396aea71fec9f7589e44fb632 (diff)
downloadorg.eclipse.emf.compare-dc773c407d3f20b949e50cea8bdb9e314b9d4310.tar.gz
org.eclipse.emf.compare-dc773c407d3f20b949e50cea8bdb9e314b9d4310.tar.xz
org.eclipse.emf.compare-dc773c407d3f20b949e50cea8bdb9e314b9d4310.zip
Raising timeout so that hudson can get this done within the limits.
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
index 5a181218f..5c0b340fa 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
@@ -76,11 +76,15 @@ public class LCSPerformanceTest {
/**
* Will fail if {@link #checkTestData()} does.
* <p>
- * The real assertion here is that this should never take more than 30 seconds (really, 20) to execute. We
- * have 1900 additions to merge, accounting for as many LCS computations.
+ * The real assertion here is that this should never take more than 40 seconds to execute. We have 1900
+ * additions to merge, accounting for as many LCS computations.
+ * </p>
+ * <p>
+ * Note that this test should run in less than 30 seconds... However that is not true on our build
+ * machine, so the timeout has been raised to 40s.
* </p>
*/
- @Test(timeout = 30000)
+ @Test(timeout = 40000)
public void copyLeftToRight() {
IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
Comparison comparison = EMFCompare.builder().build().compare(scope);
@@ -96,12 +100,11 @@ public class LCSPerformanceTest {
/**
* Will fail if {@link #checkTestData()} does.
* <p>
- * The real assertion here is that this should never take more than 2 seconds (really, one) to execute :
- * we're resetting all differences so there are only 100 "slow" ones : resetting deletions need the LCS
- * computation.
+ * The real assertion here is that this should never take more than 3 seconds to execute : we're resetting
+ * all differences so there are only 100 "slow" ones : resetting deletions need the LCS computation.
* </p>
*/
- @Test(timeout = 2000)
+ @Test(timeout = 3000)
public void copyRightToLeft() {
IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
Comparison comparison = EMFCompare.builder().build().compare(scope);

Back to the top