Merge branch 'master' into conroy/deprecate-elasticsearch

aws · Mar 15, 2022 · f578525 · f578525
2 parents e483e62 + 3866213
commit f578525
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/packages/aws-cdk/test/integ/cli/cli.integtest.ts b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
@@ -5,7 +5,7 @@ import { retry, sleep } from '../helpers/aws';
 import { cloneDirectory, MAJOR_VERSION, shell, withDefaultFixture } from '../helpers/cdk';
 import { integTest } from '../helpers/test-helpers';
 
-jest.setTimeout(600 * 1000);
+jest.setTimeout(600_000);
 
 integTest('VPC Lookup', withDefaultFixture(async (fixture) => {
   fixture.log('Making sure we are clean before starting.');

diff --git a/packages/aws-cdk/test/integ/helpers/test-helpers.ts b/packages/aws-cdk/test/integ/helpers/test-helpers.ts
@@ -16,7 +16,11 @@ export function integTest(
 ) {
 
   // Integ tests can run concurrently, and are responsible for blocking themselves if they cannot.
-  const runner = shouldSkip(name) ? test.skip : test.concurrent;
+  // Because `test.concurrent` executes the test code immediately (to obtain a promise), we allow
+  // setting the `JEST_TEST_CONCURRENT` environment variable to 'false' in order to use `test`
+  // instead of `test.concurrent` (this is necessary when specifying a test pattern to verify).
+  const testKind = process.env.JEST_TEST_CONCURRENT === 'false' ? test : test.concurrent;
+  const runner = shouldSkip(name) ? testKind.skip : testKind;
 
   runner(name, async () => {
     const output = new MemoryStream();
@@ -44,4 +48,4 @@ export function integTest(
 
 function shouldSkip(testName: string) {
   return SKIP_TESTS.includes(testName);
-}
+}
diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json
@@ -15,14 +15,33 @@
         "resolveJsonModule": true,
         "composite": true,
         "incremental": true
-      },
+    },
     "include": [
         "**/*.ts",
         "**/*.d.ts",
         "lib/init-templates/**/add-project.hook.ts"
     ],
     "exclude": [
         "lib/init-templates/**/typescript/**/*.ts"
-    ]
+    ],
+    "references": [
+        {
+            "path": "../@aws-cdk/cloud-assembly-schema"
+        },
+        {
+            "path": "../@aws-cdk/cloudformation-diff"
+        },
+        {
+            "path": "../@aws-cdk/core"
+        },
+        {
+            "path": "../@aws-cdk/cx-api"
+        },
+        {
+            "path": "../@aws-cdk/region-info"
+        },
+        {
+            "path": "../cdk-assets"
+        },
+    ],
 }
-