[testng] 351/355: Merge pull request #683 from juherr/issue-420

[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 585f3c37a50b223ee91d58e8d1a26b07138eb4dc
Merge: eb7327c 46d5b09
Author: Cedric Beust <cedric at beust.com>
Date:   Thu May 21 18:22:12 2015 -0700

    Merge pull request #683 from juherr/issue-420
    
    Fix #420 Before/AfterSuite methods may not run, when classes from suite use inheritance, and one of them has enabled=false set

 CHANGES.txt                                        |  2 +
 src/main/java/org/testng/TestRunner.java           |  2 +-
 .../java/org/testng/internal/BaseClassFinder.java  |  2 +-
 .../java/org/testng/internal/ClassInfoMap.java     |  2 +-
 src/main/java/org/testng/internal/Invoker.java     | 12 ++++--
 src/test/java/test/enable/A.java                   | 28 +++++++++++++
 src/test/java/test/enable/B.java                   | 28 +++++++++++++
 src/test/java/test/enable/C.java                   | 28 +++++++++++++
 src/test/java/test/enable/EnableTest.java          | 49 +++++++++++-----------
 .../java/test/enable/Issue420BaseTestCase.java     | 19 +++++++++
 src/test/java/test/enable/Issue420FirstSample.java | 10 +++++
 .../java/test/enable/Issue420SecondSample.java     | 10 +++++
 12 files changed, 161 insertions(+), 31 deletions(-)

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