[testng] 44/160: Merge remote-tracking branch 'origin/master' into issue-465

[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 d9d85c1988e7b39d4dfd210e1020a4884822540e
Merge: 9fdab35 13b0cae
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Sun May 31 14:29:55 2015 +0200

    Merge remote-tracking branch 'origin/master' into issue-465
    
    Conflicts:
    	CHANGES.txt

 .travis.yml                                        |  7 +++--
 CHANGES.txt                                        |  4 +++
 gradle/publishing.gradle                           |  1 +
 src/main/java/org/testng/TestNG.java               |  4 ++-
 .../java/org/testng/internal/BaseTestMethod.java   |  2 +-
 src/main/java/org/testng/internal/Invoker.java     | 23 ++++++++--------
 .../java/org/testng/util/RetryAnalyzerCount.java   |  9 +++----
 src/test/java/test/ant/TestCommandLineArgs.java    |  2 +-
 .../java/test/retryAnalyzer/EventualSuccess.java   | 17 ++++++++++++
 src/test/java/test/retryAnalyzer/ExitCodeTest.java | 31 ++++++++++++++++++++++
 .../java/test/retryAnalyzer/ImmediateSuccess.java  |  9 +++++++
 .../java/test/retryAnalyzer/PersistentFailure.java | 11 ++++++++
 src/test/java/test/testng387/FailedDPTest.java     | 12 ++-------
 src/test/java/test/testng387/TestNG387.java        | 29 +++++++-------------
 src/test/resources/testng.xml                      |  5 ++--
 15 files changed, 108 insertions(+), 58 deletions(-)

diff --cc CHANGES.txt
index f93cd16,fb77429..609e364
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,7 -4,8 +4,9 @@@ Fixed: The ServiceLoaderTest on Window
  Fixed: GITHUB-691: Fix classloading issue when using TestNG 6.9.4 and JMockit. (Mathieu Sebire)
  Fixed: GITHUB-686: IAnnotationTransformer.transform is called for methods with testClass populated. (Łukasz Rekucki & Julien Herr)
  Fixed: GITHUB-420: Before/AfterSuite methods may not run, when use inheritance, and enabled=false (Jakub Tokaj & Julien Herr)
+ Fixed: GITHUB-697: Make addFailedInvocationNumber thread-safe (Ryan Schmitt)
+ Fixed: GITHUB-698: Fix exit code reporting when IRetryAnalyzer is used (Ryan Schmitt)
 +Fixed: GITHUB-465: assertEquals(Collection, Collection) prints "null" when collections are different sizes (Michael Diamond)
  
  Eclipse:
  

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