Attachment 91659 Details for Bug 162605 – patch for test.core

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

patch for test.core

test.core.patch.txt (text/plain), 3.21 KB, created by DuWayne Morris

on 2008-03-05 11:13:29 EST

(hide)

Description:

Filename:

MIME Type:

Creator: DuWayne Morris

Created: 2008-03-05 11:13:29 EST

Size: 3.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.30
>diff -u -r1.30 MANIFEST.MF
>--- META-INF/MANIFEST.MF	5 Dec 2007 20:03:40 -0000	1.30
>+++ META-INF/MANIFEST.MF	5 Mar 2008 14:25:20 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.hyades.test.core; singleton:=true
>-Bundle-Version: 4.3.0.qualifier
>+Bundle-Version: 4.4.0.qualifier
> Bundle-ClassPath: hexteh.jar,
>  hexrecr.jar,
>  test-core.jar
>Index: src-harness/org/eclipse/hyades/execution/harness/TestExecutionHarness.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.core/src-harness/org/eclipse/hyades/execution/harness/TestExecutionHarness.java,v
>retrieving revision 1.50
>diff -u -r1.50 TestExecutionHarness.java
>--- src-harness/org/eclipse/hyades/execution/harness/TestExecutionHarness.java	4 Jun 2007 13:59:06 -0000	1.50
>+++ src-harness/org/eclipse/hyades/execution/harness/TestExecutionHarness.java	5 Mar 2008 14:25:20 -0000
>@@ -145,6 +145,8 @@
> public class TestExecutionHarness {
> 
> 	private static final Object classLock = new Object();
>+	// added a timeout value, we may want to shorten it later
>+	private static final int NODE_CONNECT_TIMEOUT_SECONDS = 180;	
> 
> 	private static IRemoteHyadesComponent findRemoteHyadesComponent(
> 			final IExecutor executor) {
>@@ -691,9 +693,10 @@
> 		 * option can be turned on from callers with the
> 		 * -DALLOW_CONCURRENT_TEST_EXECUTION=TRUE flag.
> 		 */
>-		final boolean alwaysAllowConcurrentExecution = Boolean.valueOf(
>-				System.getProperty("ALLOW_CONCURRENT_TEST_EXECUTION"))
>-				.booleanValue();
>+		final boolean alwaysAllowConcurrentExecution = true;
>+		//final boolean alwaysAllowConcurrentExecution = Boolean.valueOf(
>+			//	System.getProperty("ALLOW_CONCURRENT_TEST_EXECUTION"))
>+				//.booleanValue();
> 
> 		// Default to not allowing concurrent execution once
> 		boolean allowConcurrentExecutionOnce = false;
>@@ -2461,6 +2464,9 @@
> 					"Hyades Session Connect"); //$NON-NLS-1$
> 			connectThread.setDaemon(true);
> 			connectThread.start();
>+			// add a timeout for connecting to agent
>+			int timeoutLoopCount = 0;
>+			
> 
> 			// Primary thread blocks at intervals and then polls the cancel
> 			// status of the progress monitor
>@@ -2474,7 +2480,22 @@
> 					} else {
> 						connectThread.join(1000);
> 					}
>+					// add a timeout for connecting to agent
>+					// no matter what the error is that has the session connect 
>+					// in a hang, this should break us out
>+					// this timeout is reached when the session jvm is created,
>+					// but never reaches the ready state
>+					
>+					timeoutLoopCount++;
>+					if (timeoutLoopCount >= NODE_CONNECT_TIMEOUT_SECONDS){
>+						bufError.append(StringUtil.change(
>+										TestExecutionHarness.this.systemUtility
>+												.getString("TIMEOUT_NODE_ERROR_"), "%1", machine)); //$NON-NLS-1$ //$NON-NLS-2$
>+						break;
>+						
>+					}
> 				}
>+
> 			} catch (final InterruptedException e) {
> 			}
>

Actions: View

Attachments on bug 162605: 91658 | 91659