1 files changed, 13 insertions, 22 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
index c117ee8518..fdbc6ed9fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
@@ -12,9 +12,8 @@
 package org.eclipse.emf.cdo.tests.objectivity;
 
 import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.tests.AuditTest;
-import org.eclipse.emf.cdo.tests.AuditSameSessionTest;
-import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test;
+import org.eclipse.emf.cdo.tests.ExternalReferenceTest;
+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259869_Test;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
@@ -42,25 +41,6 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
-  {
-    super.initTestClasses(testClasses);
-
-    // non-audit mode - remove audit tests
-    testClasses.remove(AuditTest.class);
-    testClasses.remove(AuditSameSessionTest.class);
-    testClasses.remove(Bugzilla_252214_Test.class);
-    // non-branching mode - remove branch tests.
-    // testClasses.remove(BranchingTest.class);
-    // testClasses.remove(BranchingSameSessionTest.class);
-
-    // Objy has a deadlock issue which prevent this test from completing.
-    // testClasses.remove(ExternalReferenceTest.class);
-    // testClasses.remove(XATransactionTest.class);
-
-  }
-
-  @Override
   protected boolean hasAuditSupport()
   {
     return false;
@@ -95,4 +75,15 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
       props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); //$NON-NLS-1$
     }
   }
+
+  @Override
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  {
+    super.initTestClasses(testClasses);
+    // There is a problem with the root resource sharing, so for now we're commenting
+    // out ExternalReferenceTest and Bugzilla_259869_Test
+    testClasses.remove(ExternalReferenceTest.class);
+    testClasses.remove(Bugzilla_259869_Test.class);
+  }
+
 }