[testng] 111/160: Merge pull request #729 from juherr/issue-599

[Eugene Zhukov]

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 471e5e4b58499febad6afc4cb56eb59972fbd8ec
Merge: a11fe86 009cc0b
Author: Cedric Beust <cedric at beust.com>
Date:   Fri Jun 12 17:48:58 2015 -0700

    Merge pull request #729 from juherr/issue-599
    
    Issue #599: IHookable ignored when a timeout is set

 CHANGES.txt                                        |  3 +-
 .../org/testng/internal/InvokeMethodRunnable.java  | 20 ++++++++--
 src/main/java/org/testng/internal/Invoker.java     | 30 ++++++---------
 .../testng/internal/MethodInvocationHelper.java    | 20 ++++++----
 src/test/java/test/hook/HookSuccess599Test.java    | 43 ++++++++++++++++++++++
 src/test/java/test/hook/HookableTest.java          | 14 +++++++
 6 files changed, 99 insertions(+), 31 deletions(-)

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