Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correctly evaluate predicates in HttpWaitStrategy #450

Merged
merged 3 commits into from
Feb 14, 2023
Merged

fix: correctly evaluate predicates in HttpWaitStrategy #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4234c0f
test: add failing tests
abendi Feb 13, 2023
8e514e8
fix: evaluate predicates boolean value instead of truthy Promise object
abendi Feb 13, 2023
a72db9b
test: rename test
abendi Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/http-wait-strategy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ describe("HttpWaitStrategy", () => {
await container.stop();
});

it("should timeout for mismatching status code", async () => {
await expect(() =>
new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
.withStartupTimeout(3000)
.withWaitStrategy(Wait.forHttp("/unknown-path", 8080).forStatusCode(200))
.start()
).rejects.toThrowError("URL /unknown-path not accessible after 3000ms for");
});

it("should wait for status code matching", async () => {
const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
Expand All @@ -42,6 +52,16 @@ describe("HttpWaitStrategy", () => {
await container.stop();
});

it("should timeout for falsy status code matching", async () => {
await expect(() =>
new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
.withStartupTimeout(3000)
.withWaitStrategy(Wait.forHttp("/hello-world", 8080).forStatusCodeMatching(() => false))
.start()
).rejects.toThrowError("URL /hello-world not accessible after 3000ms for");
});

it("should wait for response body predicate", async () => {
const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
Expand All @@ -55,6 +75,16 @@ describe("HttpWaitStrategy", () => {
await container.stop();
});

it("should timeout for falsy response body predicate", async () => {
await expect(() =>
new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
.withStartupTimeout(3000)
.withWaitStrategy(Wait.forHttp("/hello-world", 8080).forResponsePredicate(() => false))
.start()
).rejects.toThrowError("URL /hello-world not accessible after 3000ms for");
});

it("should set method", async () => {
const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withExposedPorts(8080)
Expand Down
10 changes: 8 additions & 2 deletions src/http-wait-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,19 @@ export class HttpWaitStrategy extends AbstractWaitStrategy {
return undefined;
}
},
(response) => {
async (response) => {
if (response === undefined) {
return false;
} else if (!this.predicates.length) {
return response.ok;
} else {
return this.predicates.every((predicate) => predicate(response));
for (const predicate of this.predicates) {
const result = await predicate(response);
if (!result) {
return false;
}
}
return true;
}
},
() => {
Expand Down
8 changes: 4 additions & 4 deletions src/retry-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Clock, SystemClock, Time } from "./clock";
export interface RetryStrategy<T, U> {
retryUntil(
fn: () => Promise<T>,
predicate: (result: T) => boolean,
predicate: (result: T) => boolean | Promise<boolean>,
onTimeout: () => U,
timeout: number
): Promise<T | U>;
Expand All @@ -14,7 +14,7 @@ abstract class AbstractRetryStrategy<T, U> implements RetryStrategy<T, U> {

public abstract retryUntil(
fn: () => Promise<T>,
predicate: (result: T) => boolean,
predicate: (result: T) => boolean | Promise<boolean>,
onTimeout: () => U,
timeout: number
): Promise<T | U>;
Expand All @@ -35,7 +35,7 @@ export class IntervalRetryStrategy<T, U> extends AbstractRetryStrategy<T, U> {

public async retryUntil(
fn: (attempt: number) => Promise<T>,
predicate: (result: T) => boolean,
predicate: (result: T) => boolean | Promise<boolean>,
onTimeout: () => U,
timeout: number
): Promise<T | U> {
Expand All @@ -44,7 +44,7 @@ export class IntervalRetryStrategy<T, U> extends AbstractRetryStrategy<T, U> {
let attemptNumber = 0;
let result = await fn(attemptNumber++);

while (!predicate(result)) {
while (!(await predicate(result))) {
if (this.hasTimedOut(timeout, startTime)) {
return onTimeout();
}
Expand Down