Merge pull request #278 from eclipse-rcptt/merge/master/release/2.8

Merge release/2.8 into master

Author: basilevs

launching/tests/org.eclipse.rcptt.launching.ext.tests/src/org/eclipse/rcptt/launching/ext/Q7ExternalLaunchDelegateTest.java

@@ -143,32 +143,35 @@ public void surviveRestart() throws InterruptedException, CoreException, IOExcep
 		AutLaunch launch = startAut(installDir, List.of("-consoleLog"));
 		launch.ping();
 		Command command = parse("restart-aut");
-		launch.execute(command);
-		for (long stop = currentTimeMillis() + 100_000; currentTimeMillis() < stop; ) {
-			try {
-				launch.ping();
-				Thread.yield();
-			} catch (CoreException e) {
-				break;
+		int attemptCount = Integer.getInteger(Q7ExternalLaunchDelegateTest.class.getName() + ".restartAttempts", 3);
+		for (int i = 0; i < attemptCount; i++) {
+			launch.execute(command);
+			for (long stop = currentTimeMillis() + 100_000; currentTimeMillis() < stop; ) {
+				try {
+					launch.ping();
+					Thread.yield();
+				} catch (CoreException e) {
+					break;
+				}
 			}
-		}
-		
-		try {
-			launch.ping();
-			fail("AUT should be temporarily unavailable");
-		} catch (CoreException e) {
-		}
-		
-		for (long stop = currentTimeMillis() + 200_000; currentTimeMillis() < stop; ) {
+			
 			try {
 				launch.ping();
-				Thread.yield();
-				break;
+				fail("AUT should be temporarily unavailable");
 			} catch (CoreException e) {
-				// Expected for a while
 			}
+			
+			for (long stop = currentTimeMillis() + 200_000; currentTimeMillis() < stop; ) {
+				try {
+					launch.ping();
+					Thread.yield();
+					break;
+				} catch (CoreException e) {
+					// Expected for a while
+				}
+			}
+			launch.ping();
 		}
-		launch.ping();
 		assertNoErrorsInOutput();
 	}