[testng] 205/355: Fix #615

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 415f14de31dc0fb71aa8f204c637eda93eff9504
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Thu Apr 23 00:19:36 2015 +0200

    Fix #615
---
 src/main/java/org/testng/xml/XmlSuite.java | 1 +
 src/main/java/org/testng/xml/XmlTest.java  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java
index bdcc3e5..32e0b64 100755
--- a/src/main/java/org/testng/xml/XmlSuite.java
+++ b/src/main/java/org/testng/xml/XmlSuite.java
@@ -599,6 +599,7 @@ public class XmlSuite implements Serializable, Cloneable {
     result.setSkipFailedInvocationCounts(skipFailedInvocationCounts());
     result.setObjectFactory(getObjectFactory());
     result.setAllowReturnValues(getAllowReturnValues());
+    result.setTimeOut(getTimeOut());
     return result;
   }
 
diff --git a/src/main/java/org/testng/xml/XmlTest.java b/src/main/java/org/testng/xml/XmlTest.java
index cbc8c12..47a7e6f 100755
--- a/src/main/java/org/testng/xml/XmlTest.java
+++ b/src/main/java/org/testng/xml/XmlTest.java
@@ -430,6 +430,10 @@ public class XmlTest implements Serializable, Cloneable {
       m_timeOut = Long.toString(timeOut);
   }
 
+  private void setTimeOut(String timeOut) {
+      m_timeOut = timeOut;
+  }
+
   public void setExpression(String expression) {
     setBeanShellExpression(expression);
   }
@@ -651,6 +655,7 @@ public class XmlTest implements Serializable, Cloneable {
     result.setVerbose(getVerbose());
     result.setParameters(getLocalParameters());
     result.setXmlPackages(getXmlPackages());
+    result.setTimeOut(getTimeOut());
 
     Map<String, List<String>> metagroups = getMetaGroups();
     for (Map.Entry<String, List<String>> group: metagroups.entrySet()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git