Skip to content

Commit e54c7bb

Browse files
committed
fixed kafka and redpanda
1 parent b94ce11 commit e54c7bb

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

packages/modules/kafka/src/kafka-container.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class KafkaContainer extends GenericContainer {
6161
private zooKeeperHost?: string;
6262
private zooKeeperPort?: number;
6363
private saslSslConfig?: SaslSslListenerOptions;
64-
private originalWaitinStrategy: WaitStrategy;
64+
private originalWaitinStrategy: WaitStrategy | undefined;
6565

6666
constructor(image: string) {
6767
super(image);
@@ -193,7 +193,12 @@ export class KafkaContainer extends GenericContainer {
193193
const boundPorts = BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, inspectResult).filter(
194194
this.exposedPorts
195195
);
196-
await waitForContainer(client, dockerContainer, this.originalWaitinStrategy, boundPorts);
196+
await waitForContainer(
197+
client,
198+
dockerContainer,
199+
this.originalWaitinStrategy ?? Wait.forListeningPorts(),
200+
boundPorts
201+
);
197202

198203
if (this.saslSslConfig && this.mode !== KafkaMode.KRAFT) {
199204
await this.createUser(container, this.saslSslConfig.sasl);

packages/modules/redpanda/src/redpanda-container.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const STARTER_SCRIPT = "/testcontainers_start.sh";
2121
const WAIT_FOR_SCRIPT_MESSAGE = "Waiting for script...";
2222

2323
export class RedpandaContainer extends GenericContainer {
24-
private originalWaitinStrategy: WaitStrategy;
24+
private originalWaitinStrategy: WaitStrategy | undefined;
2525

2626
constructor(image: string) {
2727
super(image);
@@ -71,7 +71,12 @@ export class RedpandaContainer extends GenericContainer {
7171
const boundPorts = BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, inspectResult).filter(
7272
this.exposedPorts
7373
);
74-
await waitForContainer(client, dockerContainer, this.originalWaitinStrategy, boundPorts);
74+
await waitForContainer(
75+
client,
76+
dockerContainer,
77+
this.originalWaitinStrategy ?? Wait.forListeningPorts(),
78+
boundPorts
79+
);
7580
}
7681

7782
private renderRedpandaFile(host: string, port: number): string {

0 commit comments

Comments
 (0)