Restored original message as that was not meant to have changed. Added test to for this case to LogWaitrStrategy

Author: danielbodart

packages/testcontainers/src/wait-strategies/log-wait-strategy.test.ts

@@ -3,7 +3,7 @@ import { GenericContainer } from "../generic-container/generic-container";
 import { checkContainerIsHealthy, getRunningContainerNames } from "../utils/test-helper";
 import { Wait } from "./wait";
 
-describe("LogWaitStrategy", { timeout: 180_000 }, () => {
+describe("LogWaitStrategy", { timeout: 5_000 }, () => {
   it("should wait for log", async () => {
     const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
       .withExposedPorts(8080)
@@ -54,4 +54,19 @@ describe("LogWaitStrategy", { timeout: 180_000 }, () => {
 
     expect(await getRunningContainerNames()).not.toContain(containerName);
   });
+
+
+  it("should throw an error if the message is never received", async () => {
+    const containerName = `container-${new RandomUuid().nextUuid()}`;
+
+    await expect(
+      new GenericContainer("cristianrgreco/testcontainer:1.1.14")
+        .withName(containerName)
+        .withCommand("/bin/sh", "-c", 'echo "Ready"')
+        .withWaitStrategy(Wait.forLogMessage("unexpected"))
+        .start()
+    ).rejects.toThrowError(`Log stream ended and message "unexpected" was not received`);
+
+    expect(await getRunningContainerNames()).not.toContain(containerName);
+  });
 });

packages/testcontainers/src/wait-strategies/log-wait-strategy.ts

@@ -10,7 +10,7 @@ export type Log = string;
 export class LogWaitStrategy extends AbstractWaitStrategy {
   constructor(
     private readonly message: Log | RegExp,
-    private readonly times: number
+    private readonly times: number,
   ) {
     super();
   }
@@ -21,9 +21,7 @@ export class LogWaitStrategy extends AbstractWaitStrategy {
 
   async handleTimeout(containerId: string): Promise<void> {
     await setTimeout(this.startupTimeout);
-    const message = `Log message "${this.message}" not received after ${this.startupTimeout}ms`;
-    log.error(message, { containerId });
-    throw new Error(message);
+    this.throwError(containerId, `Log message "${this.message}" not received after ${this.startupTimeout}ms`);
   }
 
   async handleLogs(container: Dockerode.Container, startTime?: Date): Promise<void> {
@@ -40,10 +38,15 @@ export class LogWaitStrategy extends AbstractWaitStrategy {
       }
     }
 
-    throw new Error("Log message not found");
+    this.throwError(container.id, `Log stream ended and message "${this.message}" was not received`);
   }
 
   matches(chunk: string): boolean {
     return this.message instanceof RegExp ? this.message.test(chunk) : chunk.includes(this.message);
   }
-}
+
+  throwError(containerId: string, message: string): void {
+    log.error(message, { containerId });
+    throw new Error(message);
+  }
+}