Simplify UDP integration tests

Author: cristianrgreco

packages/testcontainers/src/generic-container/generic-container.test.ts

@@ -10,6 +10,7 @@ import {
   getRunningContainerNames,
   waitForDockerEvent,
 } from "../utils/test-helper";
+import { Wait } from "../wait-strategies/wait";
 import { GenericContainer } from "./generic-container";
 
 describe("GenericContainer", { timeout: 180_000 }, () => {
@@ -24,9 +25,14 @@ describe("GenericContainer", { timeout: 180_000 }, () => {
   });
 
   it("should return first mapped port with regardless of protocol", async () => {
-    await using container = await new GenericContainer("mendhak/udp-listener").withExposedPorts("5005/udp").start();
+    await using container = await new GenericContainer("mendhak/udp-listener")
+      .withWaitStrategy(Wait.forLogMessage("Listening on UDP port 5005"))
+      .withExposedPorts("5005/udp")
+      .start();
+
     await checkContainerIsHealthyUdp(container);
     expect(container.getFirstMappedPort()).toBe(container.getMappedPort("5005/udp"));
+    expect(container.getFirstMappedPort()).toBe(container.getMappedPort(5005, "udp"));
   });
 
   it("should bind to specified host port", async () => {
@@ -45,12 +51,14 @@ describe("GenericContainer", { timeout: 180_000 }, () => {
   it("should bind to specified host port with a different protocol", async () => {
     const hostPort = await getPort();
     await using container = await new GenericContainer("mendhak/udp-listener")
+      .withWaitStrategy(Wait.forLogMessage("Listening on UDP port 5005"))
       .withExposedPorts({
         container: 5005,
         host: hostPort,
         protocol: "udp",
       })
       .start();
+
     await checkContainerIsHealthyUdp(container);
     expect(container.getMappedPort("5005/udp")).toBe(hostPort);
     expect(container.getMappedPort(5005, "udp")).toBe(hostPort);

packages/testcontainers/src/utils/test-helper.ts

@@ -32,23 +32,14 @@ export const checkContainerIsHealthyTls = async (container: StartedTestContainer
 };
 
 export const checkContainerIsHealthyUdp = async (container: StartedTestContainer): Promise<void> => {
-  const host = container.getHost();
-  const port = container.getMappedPort("5005/udp");
-  const readyMessage = "Listening on UDP port 5005";
   const testMessage = "health_check";
-  const client = createSocket("udp4");
-  try {
-    const logs = await container.logs();
-    for await (const log of logs) {
-      if (log.includes(readyMessage)) {
-        client.send(Buffer.from(testMessage), port, host);
-      }
-      if (log.includes(testMessage)) {
-        return;
-      }
+  await using client = createSocket("udp4");
+  client.send(Buffer.from(testMessage), container.getFirstMappedPort(), container.getHost());
+  const logs = await container.logs();
+  for await (const log of logs) {
+    if (log.includes(testMessage)) {
+      return;
     }
-  } finally {
-    client.close();
   }
 };