Ignore timeouts on closing elasticmq for sqs tests (#7765)

amarziali · web-flow · commit d6c734cebaeb · 2024-10-15T10:13:40.000+02:00
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy
@@ -46,7 +46,11 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy
@@ -75,7 +75,11 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/TimeInQueueForkedTest.groovy
@@ -44,7 +44,11 @@ class TimeInQueueForkedTest extends AgentTestRunner {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy
@@ -48,7 +48,11 @@ class LegacySqsClientForkedTest extends AgentTestRunner {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy
@@ -57,7 +57,11 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/TimeInQueueForkedTest.groovy
@@ -44,7 +44,11 @@ class TimeInQueueForkedTest extends AgentTestRunner {
 
   def cleanupSpec() {
     if (server != null) {
-      server.stopAndWait()
+      try {
+        server.stopAndWait()
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt()
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,11 @@ class LegacySqsClientForkedTest extends AgentTestRunner {`
`46`	`46`
`47`	`47`	`def cleanupSpec() {`
`48`	`48`	`if (server != null) {`
`49`		`- server.stopAndWait()`
	`49`	`+ try {`
	`50`	`+ server.stopAndWait()`
	`51`	`+ } catch (InterruptedException ie) {`
	`52`	`+ Thread.currentThread().interrupt()`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,11 @@ abstract class SqsClientTest extends VersionedNamingTestBase {`
`75`	`75`
`76`	`76`	`def cleanupSpec() {`
`77`	`77`	`if (server != null) {`
`78`		`- server.stopAndWait()`
	`78`	`+ try {`
	`79`	`+ server.stopAndWait()`
	`80`	`+ } catch (InterruptedException ie) {`
	`81`	`+ Thread.currentThread().interrupt()`
	`82`	`+ }`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,11 @@ class TimeInQueueForkedTest extends AgentTestRunner {`
`44`	`44`
`45`	`45`	`def cleanupSpec() {`
`46`	`46`	`if (server != null) {`
`47`		`- server.stopAndWait()`
	`47`	`+ try {`
	`48`	`+ server.stopAndWait()`
	`49`	`+ } catch (InterruptedException ie) {`
	`50`	`+ Thread.currentThread().interrupt()`
	`51`	`+ }`
`48`	`52`	`}`
`49`	`53`	`}`
`50`	`54`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,11 @@ class LegacySqsClientForkedTest extends AgentTestRunner {`
`48`	`48`
`49`	`49`	`def cleanupSpec() {`
`50`	`50`	`if (server != null) {`
`51`		`- server.stopAndWait()`
	`51`	`+ try {`
	`52`	`+ server.stopAndWait()`
	`53`	`+ } catch (InterruptedException ie) {`
	`54`	`+ Thread.currentThread().interrupt()`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`	`}`
`54`	`58`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,11 @@ abstract class SqsClientTest extends VersionedNamingTestBase {`
`57`	`57`
`58`	`58`	`def cleanupSpec() {`
`59`	`59`	`if (server != null) {`
`60`		`- server.stopAndWait()`
	`60`	`+ try {`
	`61`	`+ server.stopAndWait()`
	`62`	`+ } catch (InterruptedException ie) {`
	`63`	`+ Thread.currentThread().interrupt()`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`	`}`
`63`	`67`