Merge branch 'master' into brig/json-cleanup

walmartlabs · Nov 14, 2024 · 72504bb · 72504bb
2 parents cb22147 + 617c49e
commit 72504bb
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordConfiguration.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordConfiguration.java
@@ -58,7 +58,16 @@ public static ConcordRule configure() {
                 .streamAgentLogs(true)
                 .sharedContainerDir(sharedDir)
                 .useLocalMavenRepository(true)
-                .extraConfigurationSupplier(() -> "concord-agent { prefork { enabled = true } }");
+                .extraConfigurationSupplier(() -> """
+                    concord-agent {
+                        dependencyResolveTimeout = "5 seconds"
+                        logMaxDelay = "250 milliseconds"
+                        pollInterval = "250 milliseconds"
+                        prefork {
+                            enabled = true
+                        }
+                    }
+                    """);
 
         boolean localMode = Boolean.parseBoolean(System.getProperty("it.local.mode"));
         if (localMode) {

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/CryptoIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/CryptoIT.java
@@ -36,7 +36,7 @@
 public class CryptoIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure();
+    public static final ConcordRule concord = ConcordConfiguration.configure();
 
     /**
      * Tests various methods of the 'crypto' plugin.

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/FormIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/FormIT.java
@@ -49,7 +49,7 @@
 public class FormIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure();
+    public static final ConcordRule concord = ConcordConfiguration.configure();
 
     /**
      * A straightforward single form process.

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ImportsIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ImportsIT.java
@@ -40,7 +40,7 @@
 public class ImportsIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure()
+    public static final ConcordRule concord = ConcordConfiguration.configure()
             .extraConfigurationSupplier(() -> "concord-server { imports { disabledProcessors = [] } }\n" +
                     "concord-agent { imports { disabledProcessors = [] } }");
 

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/JsonStoreIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/JsonStoreIT.java
@@ -35,7 +35,7 @@
 public class JsonStoreIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure();
+    public static final ConcordRule concord = ConcordConfiguration.configure();
 
     /**
      * Tests various methods of the 'jsonStore' plugin.

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/KvTaskIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/KvTaskIT.java
@@ -32,7 +32,7 @@
 public class KvTaskIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure();
+    public static final ConcordRule concord = ConcordConfiguration.configure();
 
     /**
      * Tests various methods of the 'kv' plugin.

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/NodeRosterIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/NodeRosterIT.java
@@ -36,7 +36,7 @@
 public class NodeRosterIT extends AbstractTest {
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure();
+    public static final ConcordRule concord = ConcordConfiguration.configure();
 
     /**
      * Tests various methods of the 'noderoster' plugin.

diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/SmtpIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/SmtpIT.java
@@ -40,10 +40,11 @@
 public class SmtpIT extends AbstractTest {
 
     @RegisterExtension
-    GreenMailExtension mailServer = new GreenMailExtension(new ServerSetup(0, "0.0.0.0", ServerSetup.PROTOCOL_SMTP));
+    public static final GreenMailExtension mailServer = new GreenMailExtension(new ServerSetup(0, "0.0.0.0", ServerSetup.PROTOCOL_SMTP))
+            .withPerMethodLifecycle(false);
 
     @RegisterExtension
-    public final ConcordRule concord = ConcordConfiguration.configure()
+    public static final ConcordRule concord = ConcordConfiguration.configure()
             .containerListener(new ContainerListener() {
                 @Override
                 public void beforeStart(ContainerType type) {

diff --git a/it/server/src/test/resources/agent.conf b/it/server/src/test/resources/agent.conf
@@ -1,5 +1,9 @@
 concord-agent {
 
+    dependencyResolveTimeout = "5 seconds"
+    logMaxDelay = "250 milliseconds"
+    pollInterval = "250 milliseconds"
+
     prefork {
         enabled = true
     }