From 9ae3f5fba4f2dc9eba7cf3aab164d6950872203a Mon Sep 17 00:00:00 2001 From: iliapolo Date: Thu, 3 Apr 2025 15:00:00 +0300 Subject: [PATCH 1/3] mid work --- .../@aws-cdk-testing/cli-integ/resources/integ.jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk-testing/cli-integ/resources/integ.jest.config.js b/packages/@aws-cdk-testing/cli-integ/resources/integ.jest.config.js index 967b057..a02a565 100644 --- a/packages/@aws-cdk-testing/cli-integ/resources/integ.jest.config.js +++ b/packages/@aws-cdk-testing/cli-integ/resources/integ.jest.config.js @@ -19,7 +19,7 @@ module.exports = { // for the lock. Which is almost never what we actually care about. Set it high. testTimeout: 600000, - maxWorkers: 10, + maxWorkers: 50, reporters: [ "default", ["jest-junit", { suiteName: "jest tests", outputDirectory: "coverage" }] From 2a3257849b1d784a79dc884b4c79c535d2adcc07 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Fri, 4 Apr 2025 15:28:49 +0300 Subject: [PATCH 2/3] mid work --- packages/@aws-cdk-testing/cli-integ/lib/with-aws.ts | 2 +- ...grate--from-stack-creates-deployable-app-csharp.integtest.ts | 2 ++ ...migrate--from-stack-creates-deployable-app-java.integtest.ts | 2 ++ ...grate--from-stack-creates-deployable-app-python.integtest.ts | 2 ++ ...e--from-stack-creates-deployable-app-typescript.integtest.ts | 2 ++ .../cdk-migrate-deploys-successfully-csharp.integtest.ts | 2 ++ .../cdk-migrate-deploys-successfully-java.integtest.ts | 2 ++ .../cdk-migrate-deploys-successfully-python.integtest.ts | 2 ++ .../cdk-migrate-deploys-successfully-typescript.integtest.ts | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk-testing/cli-integ/lib/with-aws.ts b/packages/@aws-cdk-testing/cli-integ/lib/with-aws.ts index 07b3b38..0f9b981 100644 --- a/packages/@aws-cdk-testing/cli-integ/lib/with-aws.ts +++ b/packages/@aws-cdk-testing/cli-integ/lib/with-aws.ts @@ -39,7 +39,7 @@ export function withAws( return async (context: A) => { if (atmosphereEnabled()) { const atmosphere = new AtmosphereClient(atmosphereEndpoint()); - const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name }); + const allocation = await atmosphere.acquire({ pool: atmospherePool(), requester: context.name, timeoutSeconds: 60 * 30 }); const aws = await AwsClients.forIdentity(allocation.environment.region, { accessKeyId: allocation.credentials.accessKeyId, secretAccessKey: allocation.credentials.secretAccessKey, diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts index 7f7ca28..ca21656 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-csharp.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib"; const language = 'csharp'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate --from-stack creates deployable ${language} app`, withExtendedTimeoutFixture(async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts index 592ebf8..75902aa 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib"; const language = 'java'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate --from-stack creates deployable ${language} app`, withExtendedTimeoutFixture(async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts index cb169bd..33c024e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-python.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib"; const language = 'python'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate --from-stack creates deployable ${language} app`, withExtendedTimeoutFixture(async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts index 8f4d4fc..b961cb1 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-typescript.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withExtendedTimeoutFixture } from "../../../lib"; const language = 'typescript'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate --from-stack creates deployable ${language} app`, withExtendedTimeoutFixture(async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts index dda48a2..2090e1e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-csharp.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib"; const language = 'csharp'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate ${language} deploys successfully`, withCDKMigrateFixture(language, async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts index 8530918..3c1ef44 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-java.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib"; const language = 'java'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate ${language} deploys successfully`, withCDKMigrateFixture(language, async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts index 3840a80..af46476 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-python.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib"; const language = 'python'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate ${language} deploys successfully`, withCDKMigrateFixture(language, async (fixture) => { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts index 60bcfc3..0734e46 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate-deploys-successfully-typescript.integtest.ts @@ -3,6 +3,8 @@ import { integTest, withCDKMigrateFixture } from "../../../lib"; const language = 'typescript'; +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate ${language} deploys successfully`, withCDKMigrateFixture(language, async (fixture) => { From 94f24004a4e0de0548512d028d067c3535dadee9 Mon Sep 17 00:00:00 2001 From: Eli Polonsky Date: Fri, 4 Apr 2025 16:17:15 +0300 Subject: [PATCH 3/3] Update cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts --- ...-migrate--from-stack-creates-deployable-app-java.integtest.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts index 75902aa..781d26e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cdk-migrate/cdk-migrate--from-stack-creates-deployable-app-java.integtest.ts @@ -5,6 +5,7 @@ const language = 'java'; jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime + integTest( `cdk migrate --from-stack creates deployable ${language} app`, withExtendedTimeoutFixture(async (fixture) => {