Fix #811: Timeout is not working with parallel=tests

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/org/testng/internal/MethodInvocationHelper.java b/src/main/java/org/testng/internal/MethodInvocationHelper.java
index 7bff43ff..9155f423 100644
--- a/src/main/java/org/testng/internal/MethodInvocationHelper.java
+++ b/src/main/java/org/testng/internal/MethodInvocationHelper.java
@@ -17,6 +17,7 @@ import org.testng.internal.thread.IFutureResult;
 import org.testng.internal.thread.ThreadExecutionException;

 import org.testng.internal.thread.ThreadTimeoutException;

 import org.testng.internal.thread.ThreadUtil;

+import org.testng.xml.XmlSuite;

 

 import java.lang.reflect.Constructor;

 import java.lang.reflect.InvocationTargetException;

@@ -225,7 +226,7 @@ public class MethodInvocationHelper {
   protected static void invokeWithTimeout(ITestNGMethod tm, Object instance,

       Object[] parameterValues, ITestResult testResult, IHookable hookable)

       throws InterruptedException, ThreadExecutionException {

-    if (ThreadUtil.isTestNGThread()) {

+    if (ThreadUtil.isTestNGThread() && testResult.getTestContext().getCurrentXmlTest().getParallel() != XmlSuite.ParallelMode.TESTS) {

       // We are already running in our own executor, don't create another one (or we will

       // lose the time out of the enclosing executor).

       invokeWithTimeoutWithNoExecutor(tm, instance, parameterValues, testResult, hookable);