Merge pull request #509 from AndreKurait/SlowTestFixup

Slow test fixup
opensearch-project · Feb 16, 2024 · 7dac332 · 7dac332
2 parents 18e2a95 + c253aa8
commit 7dac332
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/TrafficCapture/build.gradle b/TrafficCapture/build.gradle
@@ -48,6 +48,11 @@ allprojects {
     }
 
     task slowTest(type: Test) {
+        useJUnitPlatform {
+            // SlowTests currently use additional resource overhead, so halving core based parallelism
+            systemProperty 'junit.jupiter.execution.parallel.config.strategy', 'dynamic'
+            systemProperty 'junit.jupiter.execution.parallel.config.dynamic.factor', '0.5'
+        }
         systemProperty 'disableMemoryLeakTests', 'false'
         jacoco {
             enabled = true
@@ -85,3 +90,4 @@ jacocoTestReport {
         html.destination file("${buildDir}/reports/jacoco/test/html")
     }
 }
+
diff --git a/.../migrations/trafficcapture/proxyserver/testcontainers/annotations/HttpdContainerTest.java b/.../migrations/trafficcapture/proxyserver/testcontainers/annotations/HttpdContainerTest.java
@@ -1,10 +1,16 @@
 package org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.annotations;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.junit.jupiter.api.parallel.ResourceLock;
 
 @Inherited
 @ResourceLock("HttpdContainer")
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
 @TestContainerTest
 public @interface HttpdContainerTest {
 

diff --git a/.../migrations/trafficcapture/proxyserver/testcontainers/annotations/KafkaContainerTest.java b/.../migrations/trafficcapture/proxyserver/testcontainers/annotations/KafkaContainerTest.java
@@ -1,10 +1,16 @@
 package org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.annotations;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.junit.jupiter.api.parallel.ResourceLock;
 
 @Inherited
 @ResourceLock("KafkaContainer")
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
 @TestContainerTest
 public @interface KafkaContainerTest {
 

diff --git a/...h/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java b/...h/migrations/trafficcapture/proxyserver/testcontainers/annotations/TestContainerTest.java
@@ -1,10 +1,16 @@
 package org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.annotations;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.junit.jupiter.api.Tag;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
 @Tag("longTest")
 @Testcontainers(disabledWithoutDocker = true, parallel = true)
 public @interface TestContainerTest {

diff --git a/...rations/trafficcapture/proxyserver/testcontainers/annotations/ToxiproxyContainerTest.java b/...rations/trafficcapture/proxyserver/testcontainers/annotations/ToxiproxyContainerTest.java
@@ -1,10 +1,16 @@
 package org.opensearch.migrations.trafficcapture.proxyserver.testcontainers.annotations;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.junit.jupiter.api.parallel.ResourceLock;
 
 @Inherited
 @ResourceLock("ToxiproxyContainerTestBase")
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
 @TestContainerTest
 public @interface ToxiproxyContainerTest {
 }