This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag testng-6.9.5 in repository testng.
commit 3940bc2adb0aece49cde138895f5cc4545969657 Merge: 93b96a5 33feb18 Author: Cedric Beust <[email protected]> Date: Sat Jun 13 00:05:07 2015 -0700 Merge pull request #735 from juherr/issue-575 Issue #575: TestNG ignores timeOut parameter if in XML specified parallel="tests" src/test/java/test/BaseTest.java | 12 ++++ .../test/timeout/InvocationTimeOutSampleTest.java | 10 ++- .../java/test/timeout/TestTimeOutSampleTest.java | 5 +- src/test/java/test/timeout/TimeOutFromXmlTest.java | 78 ++++++++++------------ src/test/java/test/timeout/TimeOutSample2Test.java | 10 +-- src/test/java/test/timeout/TimeOutSampleTest.java | 12 ++-- src/test/java/test/timeout/TimeOutTest.java | 73 ++++++++++---------- src/test/java/test/timeout/issue575.xml | 9 +++ 8 files changed, 109 insertions(+), 100 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
