Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-07-21 07:33:28 +0000
committerEike Stepper2015-07-21 07:33:28 +0000
commitc8eba7351ffd2d37e17db3ae3c2a7009d366b769 (patch)
tree2d2c4a768b6491086759dfa5abccb0e52bcd12f7 /plugins
parent60476414f3b097bdb93f1c0a40641210a0bce51c (diff)
downloadcdo-c8eba7351ffd2d37e17db3ae3c2a7009d366b769.tar.gz
cdo-c8eba7351ffd2d37e17db3ae3c2a7009d366b769.tar.xz
cdo-c8eba7351ffd2d37e17db3ae3c2a7009d366b769.zip
[473016] Main branch can have wrong timestamp on server
https://bugs.eclipse.org/bugs/show_bug.cgi?id=473016
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java (renamed from plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingSequenceWithChildListTest.java)4
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index 9199408d87..1598df139e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -97,7 +97,6 @@ public class AllConfigs extends ConfigTestSuite
testClasses.add(LockingManagerRestartRepositoryTest.class);
testClasses.add(LockingNotificationsTest.class);
testClasses.add(LockingSequenceTest.class);
- testClasses.add(LockingSequenceWithChildListTest.class);
testClasses.add(MultiValuedOfAttributeTest.class);
testClasses.add(MapTest.class);
testClasses.add(FeatureMapTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingSequenceWithChildListTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java
index 465f41eb4b..adc69f3021 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingSequenceWithChildListTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Locking_SequenceWithChildListTest_DISABLED.java
@@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException;
* @author Eike Stepper
*/
@Requires({ ISessionConfig.CAPABILITY_NET4J_JVM, IModelConfig.CAPABILITY_NATIVE })
-public class LockingSequenceWithChildListTest extends AbstractLockingTest
+public class Locking_SequenceWithChildListTest_DISABLED extends AbstractLockingTest
{
private static final int USERS = 10;
@@ -163,7 +163,7 @@ public class LockingSequenceWithChildListTest extends AbstractLockingTest
{
for (int allocation = 0; allocation < ADDITIONS; allocation++)
{
- CDOSession session = LockingSequenceWithChildListTest.this.openSession();
+ CDOSession session = Locking_SequenceWithChildListTest_DISABLED.this.openSession();
CDOTransaction transaction = session.openTransaction();
try

Back to the top