From ba14612b44fb7ccebc7a2b89dd8795e968fcd1c9 Mon Sep 17 00:00:00 2001 From: Rico Hermans Date: Tue, 24 Jan 2023 14:37:59 +0100 Subject: [PATCH] chore(cli): raise integ test timeout (#23812) The timeout needs to account for the worst-case running time of all tests, single-threaded. This is because a test may be started, but never be able to acquire the lock until all other tests have run. Set it to 2hrs (currently, the test suite takes ~90 minutes to run single-threaded). ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../tests/cli-integ-tests/bootstrapping.integtest.ts | 6 +----- .../cli-integ/tests/cli-integ-tests/cli.integtest.ts | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts index 4f0c2503b94f8..0666443dce013 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts @@ -2,11 +2,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { integTest, randomString, withDefaultFixture } from '../../lib'; -const timeout = process.env.CODEBUILD_BUILD_ID ? // if the process is running in CodeBuild - 3_600_000 : // 1 hour - 600_000; // 10 minutes -jest.setTimeout(timeout); // Includes the time to acquire locks -process.stdout.write(`bootstrapping.integtest.ts: Setting jest time out to ${timeout} ms`); +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime integTest('can bootstrap without execution', withDefaultFixture(async (fixture) => { const bootstrapStackName = fixture.bootstrapStackName; diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index 6d868b8f1db33..eea6797aeb99e 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts @@ -3,7 +3,7 @@ import * as os from 'os'; import * as path from 'path'; import { integTest, cloneDirectory, shell, withDefaultFixture, retry, sleep, randomInteger, withSamIntegrationFixture, RESOURCES_DIR } from '../../lib'; -jest.setTimeout(60 * 60_000); // Includes the time to acquire locks +jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime describe('ci', () => { integTest('output to stderr', withDefaultFixture(async (fixture) => {