Skip to content

Commit 7b03a19

Browse files
GavinZZGavinZZ
authored
chore(integ-runner): revert integ runner change that limits to run javascript tests (#28891)
After this PR change, #28770, integ-runner doesn't work anymore when specifying test files, i.e. yarn integ test/aws-apigatewayv2-integrations/test/websocket/integ.aws.t --update-on-failed. Closes #28890 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 4c76d16 commit 7b03a19

File tree

38 files changed

+38
-38
lines changed

38 files changed

+38
-38
lines changed

‎packages/@aws-cdk-testing/framework-integ/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "cdk-lint",
1010
"pkglint": "pkglint -f",
1111
"test": "cdk-test",
12-
"integ": "integ-runner --language javascript",
12+
"integ": "integ-runner",
1313
"package": "cdk-package",
1414
"build+test": "yarn build && yarn test",
1515
"build+extract": "yarn build",

‎packages/@aws-cdk/app-staging-synthesizer-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"watch": "cdk-watch",
4949
"lint": "cdk-lint",
5050
"test": "cdk-test",
51-
"integ": "integ-runner --language javascript",
51+
"integ": "integ-runner",
5252
"pkglint": "pkglint -f",
5353
"package": "cdk-package",
5454
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-amplify-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-appconfig-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-apprunner-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"watch": "cdk-watch",
5555
"lint": "cdk-lint",
5656
"test": "cdk-test",
57-
"integ": "integ-runner --language javascript",
57+
"integ": "integ-runner",
5858
"pkglint": "pkglint -f",
5959
"package": "cdk-package",
6060
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-cloud9-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-codestar-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"watch": "cdk-watch",
5252
"lint": "cdk-lint",
5353
"test": "cdk-test",
54-
"integ": "integ-runner --language javascript",
54+
"integ": "integ-runner",
5555
"pkglint": "pkglint -f",
5656
"package": "cdk-package",
5757
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-gamelift-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-glue-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-iot-actions-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"watch": "cdk-watch",
5252
"lint": "cdk-lint",
5353
"test": "cdk-test",
54-
"integ": "integ-runner --language javascript",
54+
"integ": "integ-runner",
5555
"pkglint": "pkglint -f",
5656
"package": "cdk-package",
5757
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-iot-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-iotevents-actions-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"watch": "cdk-watch",
4545
"lint": "cdk-lint",
4646
"test": "cdk-test",
47-
"integ": "integ-runner --language javascript",
47+
"integ": "integ-runner",
4848
"pkglint": "pkglint -f",
4949
"package": "cdk-package",
5050
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-iotevents-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-ivs-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"watch": "cdk-watch",
5454
"lint": "cdk-lint",
5555
"test": "cdk-test",
56-
"integ": "integ-runner --language javascript",
56+
"integ": "integ-runner",
5757
"pkglint": "pkglint -f",
5858
"package": "cdk-package",
5959
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"watch": "cdk-watch",
5252
"lint": "cdk-lint",
5353
"test": "cdk-test",
54-
"integ": "integ-runner --language javascript",
54+
"integ": "integ-runner",
5555
"pkglint": "pkglint -f",
5656
"package": "cdk-package",
5757
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-kinesisfirehose-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"watch": "cdk-watch",
5252
"lint": "cdk-lint",
5353
"test": "cdk-test",
54-
"integ": "integ-runner --language javascript",
54+
"integ": "integ-runner",
5555
"pkglint": "pkglint -f",
5656
"package": "cdk-package",
5757
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-lambda-go-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"watch": "cdk-watch",
5454
"lint": "cdk-lint",
5555
"test": "cdk-test",
56-
"integ": "integ-runner --language javascript",
56+
"integ": "integ-runner",
5757
"pkglint": "pkglint -f",
5858
"package": "cdk-package",
5959
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-lambda-python-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-location-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"watch": "cdk-watch",
5555
"lint": "cdk-lint",
5656
"test": "cdk-test",
57-
"integ": "integ-runner --language javascript",
57+
"integ": "integ-runner",
5858
"pkglint": "pkglint -f",
5959
"package": "cdk-package",
6060
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-msk-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-neptune-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"pkglint": "pkglint -f",

‎packages/@aws-cdk/aws-redshift-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"watch": "cdk-watch",
5353
"lint": "cdk-lint",
5454
"test": "cdk-test",
55-
"integ": "integ-runner --language javascript",
55+
"integ": "integ-runner",
5656
"pkglint": "pkglint -f",
5757
"package": "cdk-package",
5858
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-route53resolver-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"pkglint": "pkglint -f",

‎packages/@aws-cdk/aws-s3objectlambda-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"watch": "cdk-watch",
5555
"lint": "cdk-lint",
5656
"test": "cdk-test",
57-
"integ": "integ-runner --language javascript",
57+
"integ": "integ-runner",
5858
"pkglint": "pkglint -f",
5959
"package": "cdk-package",
6060
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-sagemaker-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"homepage": "https://github.com/aws/aws-cdk",
5151
"scripts": {
5252
"build": "cdk-build",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"lint": "cdk-lint",
5555
"package": "cdk-package",
5656
"pkglint": "pkglint -f",

‎packages/@aws-cdk/aws-scheduler-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"homepage": "https://github.com/aws/aws-cdk",
5050
"scripts": {
5151
"build": "cdk-build",
52-
"integ": "integ-runner --language javascript",
52+
"integ": "integ-runner",
5353
"lint": "cdk-lint",
5454
"package": "cdk-package",
5555
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-scheduler-targets-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"homepage": "https://github.com/aws/aws-cdk",
5050
"scripts": {
5151
"build": "cdk-build",
52-
"integ": "integ-runner --language javascript",
52+
"integ": "integ-runner",
5353
"lint": "cdk-lint",
5454
"package": "cdk-package",
5555
"awslint": "cdk-awslint",

‎packages/@aws-cdk/aws-servicecatalogappregistry-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"watch": "cdk-watch",
5555
"lint": "cdk-lint",
5656
"test": "cdk-test",
57-
"integ": "integ-runner --language javascript",
57+
"integ": "integ-runner",
5858
"pkglint": "pkglint -f",
5959
"package": "cdk-package",
6060
"awslint": "cdk-awslint",

‎packages/@aws-cdk/cdk-cli-wrapper/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"watch": "cdk-watch",
1111
"lint": "cdk-lint",
1212
"test": "cdk-test",
13-
"integ": "integ-runner --language javascript",
13+
"integ": "integ-runner",
1414
"pkglint": "pkglint -f",
1515
"package": "cdk-package",
1616
"awslint": "cdk-awslint",

‎packages/@aws-cdk/custom-resource-handlers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "0.0.0",
66
"scripts": {
77
"build": "tsc -b && node scripts/generate.js",
8-
"integ": "integ-runner --language javascript",
8+
"integ": "integ-runner",
99
"lint": "cdk-lint",
1010
"package": "cdk-package",
1111
"awslint": "cdk-awslint",

‎packages/@aws-cdk/example-construct-library/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"watch": "cdk-watch",
4949
"lint": "cdk-lint",
5050
"test": "cdk-test",
51-
"integ": "integ-runner --language javascript",
51+
"integ": "integ-runner",
5252
"pkglint": "pkglint -f",
5353
"package": "cdk-package",
5454
"awslint": "cdk-awslint",

‎packages/@aws-cdk/integ-runner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"awslint": "cdk-awslint",
1515
"pkglint": "pkglint -f",
1616
"test": "cdk-test",
17-
"integ": "integ-runner --language javascript",
17+
"integ": "integ-runner",
1818
"watch": "cdk-watch",
1919
"build+test": "yarn build && yarn test",
2020
"build+test+package": "yarn build+test && yarn package",

‎packages/@aws-cdk/integ-tests-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"awslint": "cdk-awslint",
5151
"pkglint": "pkglint -f",
5252
"test": "cdk-test",
53-
"integ": "integ-runner --language javascript",
53+
"integ": "integ-runner",
5454
"watch": "cdk-watch",
5555
"build+test": "yarn build && yarn test",
5656
"build+test+package": "yarn build+test && yarn package",

‎packages/cdk-assets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"scripts": {
1212
"build": "cdk-build",
13-
"integ": "integ-runner --language javascript",
13+
"integ": "integ-runner",
1414
"lint": "cdk-lint",
1515
"package": "cdk-package",
1616
"awslint": "cdk-awslint",

‎tools/@aws-cdk/cdk-build-tools/bin/cdk-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ async function main() {
5252

5353
// Run integration test if the package has integ test files
5454
if (await hasIntegTests()) {
55-
await shell(['integ-runner', '--language', 'javascript'], defaultShellOptions);
55+
await shell(['integ-runner'], defaultShellOptions);
5656
}
5757
}
5858

‎tools/@aws-cdk/pkglint/lib/rules.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ export class MustHaveIntegCommand extends ValidationRule {
12311231
public validate(pkg: PackageJson): void {
12321232
if (!hasIntegTests(pkg)) { return; }
12331233

1234-
expectJSON(this.name, pkg, 'scripts.integ', 'integ-runner --language javascript');
1234+
expectJSON(this.name, pkg, 'scripts.integ', 'integ-runner');
12351235

12361236
// We can't ACTUALLY require cdk-build-tools/package.json here,
12371237
// because WE don't depend on cdk-build-tools and we don't know if

0 commit comments

Comments
 (0)