Merge pull request #50324 from xstefank/lra-tck-fix

Fix LRA TCK so it is possible to run it with the separate coordinator

Author: gsmet

tcks/microprofile-lra/src/main/java/io/quarkus/tck/lra/LRACoordinatorManager.java

@@ -16,6 +16,7 @@ public class LRACoordinatorManager {
     private static final int DEFAULT_PRECEDENCE = -100;
     private static final Logger LOGGER = LoggerFactory.getLogger(LRACoordinatorManager.class);
     private final int coordinatorPort = getFreePort(50000, 60000);
+    private String quarkusLraDevservicesEnabledValue = null;
 
     private GenericContainer coordinatorContainer;
 
@@ -30,25 +31,31 @@ public void beforeClass(
                     // need to run with host network because coordinator calls the TCK services from the container
                     .withNetworkMode("host")
                     .waitingFor(Wait.forLogMessage(".*lra-coordinator-quarkus.*", 1));
-            ;
 
             coordinatorContainer.start();
             coordinatorContainer.followOutput(logConsumer);
             System.setProperty("lra.coordinator.url", String.format("http://localhost:%d/lra-coordinator", coordinatorPort));
             // Can we reuse Dev Services for LRA coordinator here?
-            System.setProperty("quarkus.lra.devservices.enabled", "false");
         }
+
+        // Always disable Quarkus LRA Dev Services (even if ran without a separate coordinator)
+        quarkusLraDevservicesEnabledValue = System.getProperty("quarkus.lra.devservices.enabled");
+        System.setProperty("quarkus.lra.devservices.enabled", "false");
     }
 
     public void afterClass(
             @Observes(precedence = DEFAULT_PRECEDENCE) org.jboss.arquillian.test.spi.event.suite.AfterSuite event) {
         if (coordinatorContainer != null && coordinatorContainer.isRunning()) {
             coordinatorContainer.stop();
+
+            // clear the system property so that it does not affect other tests
+            System.clearProperty("lra.coordinator.url");
         }
 
-        // clear the system property so that it does not affect other tests
-        System.clearProperty("lra.coordinator.url");
-        System.clearProperty("quarkus.lra.devservices.enabled");
+        if (quarkusLraDevservicesEnabledValue != null) {
+            System.setProperty("quarkus.lra.devservices.enabled", quarkusLraDevservicesEnabledValue);
+            quarkusLraDevservicesEnabledValue = null;
+        }
     }
 
     public int getFreePort(int from, int to) {