Update testng to 6.14.3

This version has bug when `SkipException` in TestListener leads to test
being marked as `FAILED`.
To workaround this issue TestListener has to set status specifically.

Author: dkropachev

Makefile

@@ -0,0 +1,81 @@
+SHELL := bash
+DEBUG ?= false
+DRY_RUN ?= true
+SKIP_TESTS ?= false
+GITHUB_STEP_SUMMARY ?=
+SCYLLA_VERSION ?= release:2025.3
+CASSANDRA_VERSION ?= cassanra:5
+
+#ifeq ($(shell if [[ -n "$${GITHUB_STEP_SUMMARY}" ]]; then echo "running-in-workflow"; else echo "running-in-shell"; fi), running-in-workflow)
+#	DEBUG = true
+#endif
+
+ifneq (${GITHUB_STEP_SUMMARY},)
+	DEBUG = true
+endif
+
+_RELEASE_PUBLISH ?=
+ifneq (${DRY_RUN},true)
+	_RELEASE_PUBLISH= -Drelease.autopublish=true
+endif
+
+_RELEASE_SKIP_TESTS ?=
+ifneq (${SKIP_TESTS},false)
+	_RELEASE_SKIP_TESTS= -DskipTests=true -DskipITs=true
+endif
+
+ifeq (${DEBUG},false)
+	MVNCMD ?= mvn
+else
+	MVNCMD ?= mvn -B -X -ntp
+endif
+
+fmt:
+	$(MVNCMD) fmt:format
+
+compile:
+	$(MVNCMD) compile test-compile -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
+
+verify:
+	$(MVNCMD) verify -DskipTests
+
+test-unit:
+	$(MVNCMD) test -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
+
+test-integration-scylla:
+	mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=should_stop_if_cancelled_between_attempts -B verify -Pshort -Dscylla.version=$(SCYLLA_VERSION) -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
+
+test-integration-cassandra:
+	mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=should_stop_if_cancelled_between_attempts -B verify -Pshort -Dcassandra.version=$(CASSANDRA_VERSION) -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
+
+test: fmt compile verify test-unit
+
+release-prepare:
+ifeq ($(shell if [[ -n "$${GPG_PASSPHRASE}" ]]; then echo "present"; else echo "absent"; fi), absent)
+	@echo "environment variable GPG_PASSPHRASE has to be set"
+	@exit 1
+endif
+	MAVEN_OPTS="$${MAVEN_OPTS}$(_RELEASE_SKIP_TESTS)" $(MVNCMD) release:prepare -Drelease.push.changes=false -Dgpg.passphrase=$${GPG_PASSPHRASE}
+
+.release:
+ifeq ($(shell if [[ -n "$${GPG_PASSPHRASE}" ]]; then echo "present"; else echo "absent"; fi), absent)
+	@echo "environment variable GPG_PASSPHRASE has to be set"
+	@exit 1
+endif
+ifeq ($(shell if [[ -n "$${SONATYPE_TOKEN_USERNAME}" ]]; then echo "present"; else echo "absent"; fi), absent)
+	@echo "environment variable SONATYPE_TOKEN_USERNAME has to be set"
+	@exit 1
+endif
+ifeq ($(shell if [[ -n "$${SONATYPE_TOKEN_PASSWORD}" ]]; then echo "present"; else echo "absent"; fi), absent)
+	@echo "environment variable SONATYPE_TOKEN_PASSWORD has to be set"
+	@exit 1
+endif
+	MAVEN_OPTS="$${MAVEN_OPTS}$(_RELEASE_SKIP_TESTS)" $(MVNCMD) release:perform -Dgpg.passphrase=$${GPG_PASSPHRASE} $(_RELEASE_PUBLISH)
+
+release:
+	$(MAKE) .release DRY_RUN=false
+
+release-dry-run:
+	$(MAKE) .release DRY_RUN=true
+
+

driver-core/src/test/java/com/datastax/driver/core/TestListener.java

@@ -123,6 +123,14 @@ public void beforeInvocation(IInvokedMethod testMethod, ITestResult testResult)
     Method method = constructorOrMethod.getMethod();
     if (method != null) {
       scanAnnotatedElement(method);
+      try {
+        scanAnnotatedElement(method);
+      } catch (SkipException e) {
+        // There is a bug in testng 6.14.3 when `SkipException` marks test as failed.
+        // To work it around we set test status beforehand.
+        testResult.setStatus(ITestResult.SKIP);
+        throw e;
+      }
     }
   }
 

pom.xml

@@ -79,7 +79,7 @@
         <!-- more recent versions of pax-exam require JDK7+ -->
         <pax-exam.version>3.6.0</pax-exam.version>
         <url.version>2.4.0</url.version>
-        <testng.version>6.8.8</testng.version>
+        <testng.version>6.14.3</testng.version>
         <assertj.version>1.7.0</assertj.version>
         <mockito.version>1.10.8</mockito.version>
         <wiremock.version>2.25.0</wiremock.version>