Skip to content

Commit 3600668

Browse files
kuhekuhe
authored
test: remove turbo from test orchestration (#6615)
* test: remove turbo from test orchestration * test(client-s3): build browser bundle for test
1 parent 2bd2350 commit 3600668

File tree

13 files changed

+174
-24
lines changed

13 files changed

+174
-24
lines changed

‎Makefile‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,27 @@ login:
1212
sync:
1313
make -f Makefile.private.mk sync
1414

15+
test-unit: build-s3-browser-bundle
16+
npx vitest run -c vitest.config.ts
17+
npx vitest run -c vitest.config.browser.ts
18+
npx vitest run -c vitest.config.clients.unit.ts
19+
npx jest -c jest.config.js
20+
21+
test-protocols: build-s3-browser-bundle
22+
npx vitest run -c vitest.config.protocols.integ.ts
23+
24+
test-integration: build-s3-browser-bundle
25+
npx vitest run -c vitest.config.integ.ts
26+
npx jest -c jest.config.integ.js
27+
make test-protocols;
28+
29+
test-e2e: build-s3-browser-bundle
30+
npx vitest run -c vitest.config.e2e.ts
31+
npx vitest run -c vitest.config.browser.e2e.ts
32+
33+
build-s3-browser-bundle:
34+
node ./clients/client-s3/test/browser-build/esbuild
35+
1536
# removes nested node_modules folders
1637
clean-nested:
1738
rm -rf ./lib/*/node_modules
@@ -55,9 +76,9 @@ tpk:
5576
npx turbo run build --filter='./packages/*'
5677

5778
# Clears the Turborepo local build cache
58-
turbo-clean:
79+
turbo-clean:
5980
@read -p "Are you sure you want to delete your local cache? [y/N]: " ans && [ $${ans:-N} = y ]
60-
@echo "\nDeleted cache folders: \n--------"
81+
@echo "\nDeleted cache folders: \n--------"
6182
@find . -name '.turbo' -type d -prune -print -exec rm -rf '{}' + && echo '\n'
6283

6384
server-protocols:

‎clients/client-sts/test/defaultRoleAssumers.spec.ts‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,13 @@ describe("getDefaultRoleAssumer", () => {
124124
});
125125

126126
it("should use the STS client config", async () => {
127-
const logger = console;
127+
const logger = {
128+
trace() {},
129+
debug() {},
130+
info() {},
131+
warn() {},
132+
error() {},
133+
};
128134
const region = "some-region";
129135
const handler = new NodeHttpHandler();
130136
const roleAssumer = getDefaultRoleAssumer({
@@ -152,7 +158,13 @@ describe("getDefaultRoleAssumer", () => {
152158
});
153159

154160
it("should use the parent client config", async () => {
155-
const logger = console;
161+
const logger = {
162+
trace() {},
163+
debug() {},
164+
info() {},
165+
warn() {},
166+
error() {},
167+
};
156168
const region = "some-region";
157169
const handler = new NodeHttpHandler();
158170
const roleAssumer = getDefaultRoleAssumer({
@@ -177,7 +189,13 @@ describe("getDefaultRoleAssumer", () => {
177189
});
178190

179191
it("should not pass through an Http2 requestHandler", async () => {
180-
const logger = console;
192+
const logger = {
193+
trace() {},
194+
debug() {},
195+
info() {},
196+
warn() {},
197+
error() {},
198+
};
181199
const region = "some-region";
182200
const handler = new NodeHttp2Handler();
183201
const roleAssumer = getDefaultRoleAssumer({
@@ -250,7 +268,13 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
250268
});
251269

252270
it("should use the STS client config", async () => {
253-
const logger = console;
271+
const logger = {
272+
trace() {},
273+
debug() {},
274+
info() {},
275+
warn() {},
276+
error() {},
277+
};
254278
const region = "some-region";
255279
const handler = new NodeHttpHandler();
256280
const roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity({

‎codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultRoleAssumers.spec.ts‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,13 @@ describe("getDefaultRoleAssumer", () => {
122122
});
123123

124124
it("should use the STS client config", async () => {
125-
const logger = console;
125+
const logger = {
126+
trace() {},
127+
debug() {},
128+
info() {},
129+
warn() {},
130+
error() {},
131+
};
126132
const region = "some-region";
127133
const handler = new NodeHttpHandler();
128134
const roleAssumer = getDefaultRoleAssumer({
@@ -150,7 +156,13 @@ describe("getDefaultRoleAssumer", () => {
150156
});
151157

152158
it("should use the parent client config", async () => {
153-
const logger = console;
159+
const logger = {
160+
trace() {},
161+
debug() {},
162+
info() {},
163+
warn() {},
164+
error() {},
165+
};
154166
const region = "some-region";
155167
const handler = new NodeHttpHandler();
156168
const roleAssumer = getDefaultRoleAssumer({
@@ -175,7 +187,13 @@ describe("getDefaultRoleAssumer", () => {
175187
});
176188

177189
it("should not pass through an Http2 requestHandler", async () => {
178-
const logger = console;
190+
const logger = {
191+
trace() {},
192+
debug() {},
193+
info() {},
194+
warn() {},
195+
error() {},
196+
};
179197
const region = "some-region";
180198
const handler = new NodeHttp2Handler();
181199
const roleAssumer = getDefaultRoleAssumer({
@@ -248,7 +266,13 @@ describe("getDefaultRoleAssumerWithWebIdentity", () => {
248266
});
249267

250268
it("should use the STS client config", async () => {
251-
const logger = console;
269+
const logger = {
270+
trace() {},
271+
debug() {},
272+
info() {},
273+
warn() {},
274+
error() {},
275+
};
252276
const region = "some-region";
253277
const handler = new NodeHttpHandler();
254278
const roleAssumerWithWebIdentity = getDefaultRoleAssumerWithWebIdentity({

‎jest.config.e2e.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77
module.exports = {
88
projects: [
9-
"<rootDir>/clients/*/jest.config.e2e.js",
9+
// "<rootDir>/clients/*/jest.config.e2e.js",
1010
// "<rootDir>/lib/*/jest.config.integ.js",
11-
"<rootDir>/packages/*/jest.config.e2e.js",
11+
// "<rootDir>/packages/*/jest.config.e2e.js",
1212
// "<rootDir>/private/*/jest.config.e2e.js",
1313
],
1414
};

‎jest.config.integ.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ module.exports = {
1212
// "<rootDir>/clients/*/jest.config.integ.js",
1313
// "<rootDir>/lib/*/jest.config.integ.js",
1414
"<rootDir>/packages/*/jest.config.integ.js",
15-
"<rootDir>/private/*/jest.config.integ.js",
15+
// "<rootDir>/private/*/jest.config.integ.js",
1616
],
1717
};

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434
"local-publish": "node ./scripts/verdaccio-publish/index.js",
3535
"test:all": "yarn build:all && jest --passWithNoTests && lerna run test --scope '@aws-sdk/{fetch-http-handler,hash-blob-browser}' && yarn test:versions && yarn test:integration",
3636
"test:ci": "lerna run test --since origin/main",
37-
"test:e2e": "node ./scripts/turbo test:e2e --env-mode=loose && node ./tests/canary/canary",
37+
"test:e2e": "make test-e2e && node ./tests/canary/canary",
3838
"test:e2e:legacy": "cucumber-js --fail-fast",
3939
"test:e2e:legacy:preview": "./tests/e2e-legacy/preview.mjs",
4040
"test:e2e:legacy:since:release": "./tests/e2e-legacy/since-release.mjs",
4141
"test:functional": "jest --passWithNoTests --config tests/functional/jest.config.js && lerna run test --scope \"@aws-sdk/client-*\"",
42-
"test:integration": "node ./scripts/turbo test:integration",
42+
"test:integration": "make test-integration",
4343
"test:integration:legacy": "yarn test:e2e:legacy",
4444
"test:integration:legacy:since:release": "yarn test:e2e:legacy:since:release",
4545
"test:protocols": "yarn build:protocols && lerna run test --scope '@aws-sdk/aws-protocoltests-*'",
4646
"test:server-protocols": "yarn build:server-protocols && lerna run test --scope '@aws-sdk/*-server'",
4747
"test:size": "cd scripts/benchmark-size/runner && yarn && ts-node ./cli.ts",
48-
"test:unit": "node ./scripts/turbo test",
48+
"test:unit": "make test-unit",
4949
"test:versions": "jest --config tests/versions/jest.config.js tests/versions/index.spec.ts",
5050
"update:versions:default": "node --es-module-specifier-resolution=node ./scripts/update-versions/default.mjs",
5151
"update:versions:current": "node --es-module-specifier-resolution=node ./scripts/update-versions/current.mjs"

‎vitest.config.browser.e2e.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
exclude: ["**/*/node_modules/**/*.spec.ts"],
6+
include: ["**/*.browser.e2e.spec.ts"],
7+
environment: "happy-dom",
8+
},
9+
});

‎vitest.config.browser.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
exclude: ["**/*/node_modules/**/*.spec.ts"],
6+
include: [
7+
"packages/util-user-agent-browser/src/index.spec.ts",
8+
"packages/util-user-agent-browser/src/index.native.spec.ts",
9+
"packages/credential-provider-cognito-identity/src/localStorage-inmemoryStorage.spec.ts",
10+
"packages/body-checksum-browser/src/index.spec.ts",
11+
"packages/middleware-websocket/src/get-event-signing-stream.spec.ts",
12+
"packages/middleware-websocket/src/EventStreamPayloadHandler.spec.ts",
13+
"packages/credential-provider-cognito-identity/src/localStorage.spec.ts",
14+
],
15+
environment: "happy-dom",
16+
},
17+
});

‎vitest.config.clients.unit.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
exclude: ["**/*/node_modules/**/*.spec.ts", "**/*.{integ,e2e,browser}.spec.ts"],
6+
include: ["clients/client-*/**/*.spec.ts"],
7+
environment: "node",
8+
},
9+
});

‎vitest.config.e2e.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { defineConfig } from "vitest/config";
22

33
export default defineConfig({
44
test: {
5-
exclude: ["node_modules", "**/*.browser.e2e.spec.ts"],
6-
include: ["**/*.e2e.spec.ts"],
5+
exclude: ["**/*/node_modules/**/*.spec.ts", "**/*.browser.e2e.spec.ts"],
6+
include: ["clients/**/*.e2e.spec.ts", "lib/**/*.e2e.spec.ts", "packages/**/*.e2e.spec.ts"],
77
environment: "node",
88
},
99
});

0 commit comments

Comments
 (0)