[376566] Clone Repository doesn't retry to init root resource

https://bugs.eclipse.org/bugs/show_bug.cgi?id=376566

2 files changed, 97 insertions, 89 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
index 4b491de781..5c62efd2d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (H2 offline).launch
@@ -1,16 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db.AllTestsDBH2Offline"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="com.chronon.sb.browser.launcher.launchattrs.excludePatterns"/>
+<listAttribute key="com.chronon.sb.browser.launcher.launchattrs.includePatterns">
+<listEntry value="org.eclipse.**"/>
+</listAttribute>
+<intAttribute key="com.chronon.sb.browser.launcher.launchattrs.jretype" value="64"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db.AllTestsDBH2Offline"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java
index b7101a70f4..e8193b61e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Offline.java
@@ -1,73 +1,75 @@
-/*

- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Eike Stepper - initial API and implementation

- */

-package org.eclipse.emf.cdo.tests.db;

-

-import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;

-import org.eclipse.emf.cdo.tests.config.IScenario;

-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_319552_Test;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_325097_Test;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_326047_Test;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_328352_Test;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_329014_Test;

-import org.eclipse.emf.cdo.tests.offline.Bugzilla_376470_Test;

-import org.eclipse.emf.cdo.tests.offline.FailoverTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineDelayedTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineLockRawReplicationTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineLockReplicationTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineLockingTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineRawTest;

-import org.eclipse.emf.cdo.tests.offline.OfflineTest;

-

-import java.util.List;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-/**

- * @author Eike Stepper

- */

-public class AllTestsDBH2Offline extends DBConfigs

-{

-  public static Test suite()

-  {

-    return new AllTestsDBH2Offline().getTestSuite("CDO Tests (DBStore H2 Horizontal - offline mode)");

-  }

-

-  @Override

-  protected void initConfigSuites(TestSuite parent)

-  {

-    addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);

-    addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);

-    addScenario(parent, COMBINED, new H2OfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);

-  }

-

-  @Override

-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)

-  {

-    testClasses.add(OfflineTest.class);

-    testClasses.add(OfflineRawTest.class);

-    testClasses.add(OfflineDelayedTest.class);

-    testClasses.add(OfflineLockingTest.class);

-    testClasses.add(OfflineLockReplicationTest.class);

-    testClasses.add(OfflineLockRawReplicationTest.class);

-

-    testClasses.add(Bugzilla_329014_Test.class);

-    testClasses.add(Bugzilla_328352_Test.class);

-    testClasses.add(Bugzilla_326047_Test.class);

-    testClasses.add(Bugzilla_325097_Test.class);

-    testClasses.add(Bugzilla_319552_Test.class);

-    testClasses.add(Bugzilla_376470_Test.class);

-    testClasses.add(Bugzilla_351078_DB_Test.class);

-

-    testClasses.add(FailoverTest.class);

-  }

-}

+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.db;
+
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
+import org.eclipse.emf.cdo.tests.config.IScenario;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_319552_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_325097_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_326047_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_328352_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_329014_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_376470_Test;
+import org.eclipse.emf.cdo.tests.offline.Bugzilla_376566_Test;
+import org.eclipse.emf.cdo.tests.offline.FailoverTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineDelayedTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineLockRawReplicationTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineLockReplicationTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineLockingTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineRawTest;
+import org.eclipse.emf.cdo.tests.offline.OfflineTest;
+
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Eike Stepper
+ */
+public class AllTestsDBH2Offline extends DBConfigs
+{
+  public static Test suite()
+  {
+    return new AllTestsDBH2Offline().getTestSuite("CDO Tests (DBStore H2 Horizontal - offline mode)");
+  }
+
+  @Override
+  protected void initConfigSuites(TestSuite parent)
+  {
+    addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+    addScenario(parent, COMBINED, new H2OfflineConfig(false, false, IDGenerationLocation.CLIENT), JVM, NATIVE);
+    addScenario(parent, COMBINED, new H2OfflineConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
+  }
+
+  @Override
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
+  {
+    testClasses.add(OfflineTest.class);
+    testClasses.add(OfflineRawTest.class);
+    testClasses.add(OfflineDelayedTest.class);
+    testClasses.add(OfflineLockingTest.class);
+    testClasses.add(OfflineLockReplicationTest.class);
+    testClasses.add(OfflineLockRawReplicationTest.class);
+
+    testClasses.add(Bugzilla_329014_Test.class);
+    testClasses.add(Bugzilla_328352_Test.class);
+    testClasses.add(Bugzilla_326047_Test.class);
+    testClasses.add(Bugzilla_325097_Test.class);
+    testClasses.add(Bugzilla_319552_Test.class);
+    testClasses.add(Bugzilla_376470_Test.class);
+    testClasses.add(Bugzilla_376566_Test.class);
+    testClasses.add(Bugzilla_351078_DB_Test.class);
+
+    testClasses.add(FailoverTest.class);
+  }
+}