Skip to content

Commit 9423da7

Browse files
update test timeouts
Signed-off-by: Brooke Hamilton <[email protected]>
1 parent 39685cf commit 9423da7

6 files changed

Lines changed: 113 additions & 105 deletions

File tree

.github/workflows/dev-containers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
cli:
1717
name: CLI
1818
runs-on: ubuntu-latest
19+
timeout-minutes: 10
1920
steps:
2021
- uses: actions/checkout@v6
2122
- uses: actions/setup-node@v5
@@ -44,6 +45,7 @@ jobs:
4445
tests-matrix:
4546
name: Tests Matrix
4647
runs-on: ubuntu-latest
48+
timeout-minutes: 30
4749
strategy:
4850
fail-fast: false
4951
matrix:
@@ -111,6 +113,7 @@ jobs:
111113
# TODO: This should be expanded to run on different platforms
112114
# Most notably to test platform-specific credential helper behavior
113115
runs-on: ubuntu-latest
116+
timeout-minutes: 10
114117
steps:
115118
- name: Checkout
116119
uses: actions/checkout@v6
@@ -145,6 +148,7 @@ jobs:
145148
matrix:
146149
os: [ubuntu-latest, macos-latest]
147150
runs-on: ${{ matrix.os }}
151+
timeout-minutes: 10
148152
steps:
149153
- uses: actions/checkout@v6
150154
- name: Run install.sh tests

.github/workflows/test-docker-v20.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
test-docker-v20:
1414
name: Docker v20.10 Compatibility
1515
runs-on: ubuntu-22.04
16+
timeout-minutes: 20
1617

1718
steps:
1819
- uses: actions/checkout@v6

.github/workflows/test-docker-v29.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
test-docker-v29:
1414
name: Docker v29.0.0 Compatibility
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 20
1617

1718
steps:
1819
- uses: actions/checkout@v6

.github/workflows/test-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
tests-matrix:
2020
name: Tests Matrix (Windows)
2121
runs-on: windows-latest
22+
timeout-minutes: 15
2223
strategy:
2324
fail-fast: false
2425
matrix:

.mocharc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
timeout: 360000 # 6 minutes global safety net; individual suites override via this.timeout()

package.json

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
11
{
2-
"name": "@devcontainers/cli",
3-
"description": "Dev Containers CLI",
4-
"version": "0.85.0",
5-
"bin": {
6-
"devcontainer": "devcontainer.js"
7-
},
8-
"author": "Microsoft Corporation",
9-
"repository": {
10-
"type": "git",
11-
"url": "https://github.com/devcontainers/cli.git"
12-
},
13-
"bugs": {
14-
"url": "https://github.com/devcontainers/cli/issues"
15-
},
16-
"license": "MIT",
17-
"engines": {
18-
"node": ">=20.0.0"
19-
},
20-
"scripts": {
21-
"compile": "npm-run-all clean-dist compile-dev",
22-
"watch": "npm-run-all clean-dist compile-watch",
23-
"package": "npm-run-all clean-dist compile-prod store-packagejson patch-packagejson npm-pack restore-packagejson",
24-
"store-packagejson": "copyfiles package.json build-tmp/",
25-
"patch-packagejson": "node build/patch-packagejson.js",
26-
"restore-packagejson": "copyfiles --up 1 build-tmp/package.json .",
27-
"type-check": "npm-run-all clean-built tsc-b",
28-
"type-check-watch": "npm-run-all clean-built tsc-b-w",
29-
"compile-prod": "node esbuild.js --production",
30-
"compile-dev": "node esbuild.js",
31-
"compile-watch": "node esbuild.js --watch",
32-
"tsc-b": "tsc -b",
33-
"tsc-b-w": "tsc -b -w",
34-
"precommit": "node build/hygiene.js",
35-
"lint": "eslint --max-warnings 0 ./src",
36-
"npm-pack": "npm pack",
37-
"clean": "npm-run-all clean-dist clean-built",
38-
"clean-dist": "rimraf dist",
39-
"clean-built": "rimraf built",
40-
"test": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/*.test.ts",
41-
"test-matrix": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit",
42-
"test-container-features": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-features/*.test.ts",
43-
"test-container-features-cli": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-features/featuresCLICommands.test.ts",
44-
"test-container-templates": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-templates/*.test.ts"
45-
},
46-
"files": [
47-
"CHANGELOG.md",
48-
"LICENSE.txt",
49-
"README.md",
50-
"ThirdPartyNotices.txt",
51-
"devcontainer.js",
52-
"dist/spec-node/devContainersSpecCLI.js",
53-
"package.json",
54-
"scripts/updateUID.Dockerfile"
55-
],
56-
"devDependencies": {
57-
"@stylistic/eslint-plugin": "^5.10.0",
58-
"@types/chai": "^4.3.20",
59-
"@types/follow-redirects": "^1.14.4",
60-
"@types/js-yaml": "^4.0.9",
61-
"@types/mocha": "^10.0.10",
62-
"@types/ncp": "^2.0.8",
63-
"@types/node": "^20.19.37",
64-
"@types/pull-stream": "^3.6.7",
65-
"@types/recursive-readdir": "^2.2.4",
66-
"@types/semver": "^7.7.1",
67-
"@types/shell-quote": "^1.7.5",
68-
"@types/text-table": "^0.2.5",
69-
"@types/yargs": "^17.0.35",
70-
"@typescript-eslint/eslint-plugin": "^8.56.1",
71-
"@typescript-eslint/parser": "^8.56.1",
72-
"chai": "^4.5.0",
73-
"copyfiles": "^2.4.1",
74-
"esbuild": "^0.27.3",
75-
"eslint": "^10.0.2",
76-
"event-stream": "^4.0.1",
77-
"minimatch": "^10.2.4",
78-
"mocha": "^11.7.5",
79-
"npm-run-all": "^4.1.5",
80-
"p-all": "^5.0.1",
81-
"rimraf": "^6.1.3",
82-
"ts-node": "^10.9.2",
83-
"typescript": "^5.9.3",
84-
"typescript-formatter": "^7.2.2",
85-
"vinyl": "^3.0.1",
86-
"vinyl-fs": "^4.0.2"
87-
},
88-
"dependencies": {
89-
"chalk": "^5.6.2",
90-
"follow-redirects": "^1.15.11",
91-
"js-yaml": "^4.1.1",
92-
"jsonc-parser": "^3.3.1",
93-
"ncp": "^2.0.0",
94-
"node-pty": "~1.0.0",
95-
"proxy-agent": "^6.5.0",
96-
"pull-stream": "^3.7.0",
97-
"recursive-readdir": "^2.2.3",
98-
"semver": "^7.7.4",
99-
"shell-quote": "^1.8.3",
100-
"stream-to-pull-stream": "^1.7.3",
101-
"tar": "^7.5.10",
102-
"text-table": "^0.2.0",
103-
"vscode-uri": "^3.1.0",
104-
"yargs": "~17.7.2"
105-
}
106-
}
2+
"name": "@devcontainers/cli",
3+
"description": "Dev Containers CLI",
4+
"version": "0.85.0",
5+
"bin": {
6+
"devcontainer": "devcontainer.js"
7+
},
8+
"author": "Microsoft Corporation",
9+
"repository": {
10+
"type": "git",
11+
"url": "https://github.com/devcontainers/cli.git"
12+
},
13+
"bugs": {
14+
"url": "https://github.com/devcontainers/cli/issues"
15+
},
16+
"license": "MIT",
17+
"engines": {
18+
"node": ">=20.0.0"
19+
},
20+
"scripts": {
21+
"compile": "npm-run-all clean-dist compile-dev",
22+
"watch": "npm-run-all clean-dist compile-watch",
23+
"package": "npm-run-all clean-dist compile-prod store-packagejson patch-packagejson npm-pack restore-packagejson",
24+
"store-packagejson": "copyfiles package.json build-tmp/",
25+
"patch-packagejson": "node build/patch-packagejson.js",
26+
"restore-packagejson": "copyfiles --up 1 build-tmp/package.json .",
27+
"type-check": "npm-run-all clean-built tsc-b",
28+
"type-check-watch": "npm-run-all clean-built tsc-b-w",
29+
"compile-prod": "node esbuild.js --production",
30+
"compile-dev": "node esbuild.js",
31+
"compile-watch": "node esbuild.js --watch",
32+
"tsc-b": "tsc -b",
33+
"tsc-b-w": "tsc -b -w",
34+
"precommit": "node build/hygiene.js",
35+
"lint": "eslint --max-warnings 0 ./src",
36+
"npm-pack": "npm pack",
37+
"clean": "npm-run-all clean-dist clean-built",
38+
"clean-dist": "rimraf dist",
39+
"clean-built": "rimraf built",
40+
"test": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/*.test.ts",
41+
"test-matrix": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit --retries 1",
42+
"test-container-features": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-features/*.test.ts",
43+
"test-container-features-cli": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-features/featuresCLICommands.test.ts",
44+
"test-container-templates": "env TS_NODE_PROJECT=src/test/tsconfig.json mocha -r ts-node/register --exit src/test/container-templates/*.test.ts"
45+
},
46+
"files": [
47+
"CHANGELOG.md",
48+
"LICENSE.txt",
49+
"README.md",
50+
"ThirdPartyNotices.txt",
51+
"devcontainer.js",
52+
"dist/spec-node/devContainersSpecCLI.js",
53+
"package.json",
54+
"scripts/updateUID.Dockerfile"
55+
],
56+
"devDependencies": {
57+
"@stylistic/eslint-plugin": "^5.10.0",
58+
"@types/chai": "^4.3.20",
59+
"@types/follow-redirects": "^1.14.4",
60+
"@types/js-yaml": "^4.0.9",
61+
"@types/mocha": "^10.0.10",
62+
"@types/ncp": "^2.0.8",
63+
"@types/node": "^20.19.37",
64+
"@types/pull-stream": "^3.6.7",
65+
"@types/recursive-readdir": "^2.2.4",
66+
"@types/semver": "^7.7.1",
67+
"@types/shell-quote": "^1.7.5",
68+
"@types/text-table": "^0.2.5",
69+
"@types/yargs": "^17.0.35",
70+
"@typescript-eslint/eslint-plugin": "^8.56.1",
71+
"@typescript-eslint/parser": "^8.56.1",
72+
"chai": "^4.5.0",
73+
"copyfiles": "^2.4.1",
74+
"esbuild": "^0.27.3",
75+
"eslint": "^10.0.2",
76+
"event-stream": "^4.0.1",
77+
"minimatch": "^10.2.4",
78+
"mocha": "^11.7.5",
79+
"npm-run-all": "^4.1.5",
80+
"p-all": "^5.0.1",
81+
"rimraf": "^6.1.3",
82+
"ts-node": "^10.9.2",
83+
"typescript": "^5.9.3",
84+
"typescript-formatter": "^7.2.2",
85+
"vinyl": "^3.0.1",
86+
"vinyl-fs": "^4.0.2"
87+
},
88+
"dependencies": {
89+
"chalk": "^5.6.2",
90+
"follow-redirects": "^1.15.11",
91+
"js-yaml": "^4.1.1",
92+
"jsonc-parser": "^3.3.1",
93+
"ncp": "^2.0.0",
94+
"node-pty": "~1.0.0",
95+
"proxy-agent": "^6.5.0",
96+
"pull-stream": "^3.7.0",
97+
"recursive-readdir": "^2.2.3",
98+
"semver": "^7.7.4",
99+
"shell-quote": "^1.8.3",
100+
"stream-to-pull-stream": "^1.7.3",
101+
"tar": "^7.5.10",
102+
"text-table": "^0.2.0",
103+
"vscode-uri": "^3.1.0",
104+
"yargs": "~17.7.2"
105+
}
106+
}

0 commit comments

Comments
 (0)