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

testng-team · Nov 22, 2015 · 2c23fd8 · 2c23fd8
1 parent 402f6b1
commit 2c23fd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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.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 @@ protected static void invokeWithTimeout(ITestNGMethod tm, Object instance,
   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);

diff --git a/src/test/java/test/thread/FactoryTest.java b/src/test/java/test/thread/FactoryTest.java
@@ -26,11 +26,9 @@ public void verifyFactoryParallelMethods() {
     runTest(XmlSuite.ParallelMode.METHODS, 2);
   }
 
-  @Test(groups = "broken",
-      description = "Known bug:  when parallel='tests', tests returned" +
-        " by a @Factory are run in the same thread")
+  @Test
   public void verifyFactoryParallelTests() {
-    runTest(XmlSuite.ParallelMode.TESTS, 2);
+    runTest(XmlSuite.ParallelMode.TESTS, 1);
   }
 
   private void runTest(XmlSuite.ParallelMode parallelMode, int expectedThreadIdCount) {