Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-08-30 11:44:04 +0000
committerEike Stepper2012-08-30 11:44:04 +0000
commita703d0aea9446d2106d9d54951d378e752272908 (patch)
tree136fe10a2f5c2f93380eadfd10f00af4d63d3bb4 /plugins
parentf5a3132c378b508c24e1b20ecc7c2f336a0e8860 (diff)
downloadcdo-a703d0aea9446d2106d9d54951d378e752272908.tar.gz
cdo-a703d0aea9446d2106d9d54951d378e752272908.tar.xz
cdo-a703d0aea9446d2106d9d54951d378e752272908.zip
Speed up test casee
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
index b017446bbd..66af968dae 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
@@ -403,7 +403,10 @@ public class MergingTest extends AbstractCDOTest
session.close();
}
- public void testFromBranchWithChangesInSource_100() throws Exception
+ /**
+ * Bug 314605.
+ */
+ public void _testFromBranchWithChangesInSource_100() throws Exception
{
disableConsole();
for (int i = 0; i < 100; i++)

Back to the top