Deregister test repos after failure

1 files changed, 12 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index a116263fe5..845185f8ec 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -262,21 +262,28 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       }
 
       IManagedContainer serverContainer = getCurrentTest().getServerContainer();
-
       repository.setQueryHandlerProvider(new ContainerQueryHandlerProvider(serverContainer));
+      registerRepository(repository);
+
       if (activate)
       {
-        LifecycleUtil.activate(repository);
+        try
+        {
+          LifecycleUtil.activate(repository);
 
-        if (hasAnnotation(CallAddRepository.class))
+          if (hasAnnotation(CallAddRepository.class))
+          {
+            CDOServerUtil.addRepository(serverContainer, repository);
+          }
+        }
+        catch (Exception ex)
         {
-          CDOServerUtil.addRepository(serverContainer, repository);
+          deactivateRepositories();
         }
       }
     }
 
     addResourcePathChecker(repository);
-    registerRepository(repository);
 
     return repository;
   }