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.

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

Add support for Colima #526

Closed
wants to merge 36 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
cf93be1
Use network depending on Podman and enable all tests
cristianrgreco Mar 29, 2023
237dca9
Network tests only
cristianrgreco Mar 29, 2023
4c1406d
Revert to bridge driver
cristianrgreco Mar 29, 2023
5510a40
Set stream encoding
cristianrgreco Mar 29, 2023
84de955
Enable all podman tests
cristianrgreco Mar 29, 2023
c3db5b9
Update tests
cristianrgreco Mar 29, 2023
6d7a1e6
Merge branch 'main' into podman-network
cristianrgreco Mar 30, 2023
05e8fd8
Progress
cristianrgreco Mar 30, 2023
ed7e162
Fixes
cristianrgreco Mar 30, 2023
f8b332c
Re-enable Docker tests
cristianrgreco Mar 30, 2023
273319f
Fix reaper image check test
cristianrgreco Mar 30, 2023
91e7df3
Lint
cristianrgreco Mar 30, 2023
800af54
Refactor
cristianrgreco Mar 30, 2023
df1af22
Remove invalid test case
cristianrgreco Apr 4, 2023
ced826b
Merge branch 'main' into podman-network
cristianrgreco Apr 4, 2023
2d4bae7
Fix shell wait strategy tests
cristianrgreco Apr 5, 2023
fcfd80e
Add host port wait strategy to static helper
cristianrgreco Apr 6, 2023
800587c
Implement and use CompositeWaitStrategy
cristianrgreco Apr 6, 2023
a7611ab
Add colima workflow, disable others
cristianrgreco Apr 11, 2023
a87833d
Enable other jobs
cristianrgreco Apr 11, 2023
bc5453f
Update colima workflow
cristianrgreco Apr 11, 2023
f0afddf
Update workflow
cristianrgreco Apr 11, 2023
e067949
Update workflow
cristianrgreco Apr 11, 2023
92deda9
Update workflow
cristianrgreco Apr 11, 2023
71cb820
Update workflow
cristianrgreco Apr 11, 2023
f2370b1
Update workflow
cristianrgreco Apr 11, 2023
2928dbd
Update workflow
cristianrgreco Apr 11, 2023
cb549a2
Update workflow
cristianrgreco Apr 11, 2023
6667e2a
Update workflow
cristianrgreco Apr 11, 2023
94228ff
Update workflow
cristianrgreco Apr 11, 2023
259ae94
Fix some flakiness
cristianrgreco Apr 12, 2023
ae955dd
CompositeWaitStrategy defaults to max startupTimeout
cristianrgreco Apr 12, 2023
9d5a392
CompositeWaitStrategy fixes
cristianrgreco Apr 12, 2023
e9cf4b5
Remove unused var from test
cristianrgreco Apr 12, 2023
44ecc82
Re-add delay
cristianrgreco Apr 12, 2023
697b3b2
Document composite wait strategy
cristianrgreco Apr 12, 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
Prev Previous commit
Next Next commit
Fix shell wait strategy tests
cristianrgreco committed Apr 5, 2023

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
commit 2d4bae74ceccba60d6932fd3adf1a961ce0fffb4
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
"build": "npm run clean && tsc -p tsconfig.prod.json",
"docs:serve": "docker-compose up",
"clean": "rimraf dist",
"test": "cross-env DEBUG=testcontainers,testcontainers:exec,testcontainers:containers jest",
"test": "cross-env DEBUG=testcontainers* jest",
"test:ci": "npm run test -- --runInBand --coverage",
"format": "prettier --write package.json \"src/**/*.ts\"",
"lint": "eslint --fix package.json \"src/**/*.ts\"",
3 changes: 1 addition & 2 deletions src/wait-strategy/shell-wait-strategy.test.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ jest.setTimeout(180_000);
describe("ShellWaitStrategy", () => {
it("should wait for successful command", async () => {
const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withCommand(["sh", "-c", "sleep 0.5; touch /tmp/test.lock; sleep infinity"])
.withCommand(["/bin/sh", "-c", "sleep 0.5; touch /tmp/test.lock; node index.js"])
.withWaitStrategy(Wait.forSuccessfulCommand("stat /tmp/test.lock"))
.start();

@@ -16,7 +16,6 @@ describe("ShellWaitStrategy", () => {
it("should timeout when command not successful", async () => {
await expect(() =>
new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withCommand(["sh", "-c", "sleep infinity"])
.withWaitStrategy(Wait.forSuccessfulCommand("stat /tmp/test.lock"))
.withStartupTimeout(1000)
.start()