From 1573275781ff47f7232db681487d55c9713c1190 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Fri, 24 Oct 2025 13:40:48 -0700 Subject: [PATCH 1/5] add timeout for flaky test --- .../core/src/test/awsService/appBuilder/walkthrough.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index 81ea1252edb..ec9d4ad63b8 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -223,8 +223,9 @@ describe('AppBuilder Walkthrough', function () { assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo) }) - it.skip('download serverlessland proj', async function () { + it('download serverlessland proj', async function () { // When + this.timeout(60000) await genWalkthroughProject('API', workspaceUri, 'python') // Then template should be overwritten assert.equal(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), true) From 70a2a3200568b10699d408a6dd28dd75cbc17a9b Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Fri, 24 Oct 2025 13:45:15 -0700 Subject: [PATCH 2/5] add timeout for flaky test --- .../core/src/test/awsService/appBuilder/walkthrough.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index ec9d4ad63b8..81ea1252edb 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -223,9 +223,8 @@ describe('AppBuilder Walkthrough', function () { assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo) }) - it('download serverlessland proj', async function () { + it.skip('download serverlessland proj', async function () { // When - this.timeout(60000) await genWalkthroughProject('API', workspaceUri, 'python') // Then template should be overwritten assert.equal(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), true) From defb9219ff8afac28745e30c67ab5cd473a9a3f8 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Fri, 24 Oct 2025 13:46:06 -0700 Subject: [PATCH 3/5] add timeout for flaky test --- .../core/src/test/awsService/appBuilder/walkthrough.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index 81ea1252edb..4dac7a1ec78 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -223,7 +223,8 @@ describe('AppBuilder Walkthrough', function () { assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo) }) - it.skip('download serverlessland proj', async function () { + it('download serverlessland proj', async function () { + this.timeout(60000) // When await genWalkthroughProject('API', workspaceUri, 'python') // Then template should be overwritten From 3b51e834e67d61613586058db88898552af75d75 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Fri, 24 Oct 2025 14:15:46 -0700 Subject: [PATCH 4/5] add check for elements --- .../core/src/test/awsService/appBuilder/walkthrough.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index 4dac7a1ec78..7310566b996 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -224,9 +224,10 @@ describe('AppBuilder Walkthrough', function () { }) it('download serverlessland proj', async function () { - this.timeout(60000) // When - await genWalkthroughProject('API', workspaceUri, 'python') + const genPromise = genWalkthroughProject('API', workspaceUri, 'python') + await getTestWindow().waitForMessage(/template.yaml already exist/) + await genPromise // Then template should be overwritten assert.equal(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), true) assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo) From 397cd60e2855d4b26e96d788fb04d8d0f39e766f Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Fri, 24 Oct 2025 22:38:27 -0700 Subject: [PATCH 5/5] disable codelens to remove cfn scanner --- .../src/test/awsService/appBuilder/walkthrough.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index 7310566b996..add3ee6e546 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -224,13 +224,14 @@ describe('AppBuilder Walkthrough', function () { }) it('download serverlessland proj', async function () { + const config = vscode.workspace.getConfiguration('aws.samcli') + await config.update('enableCodeLenses', false, vscode.ConfigurationTarget.Global) // When - const genPromise = genWalkthroughProject('API', workspaceUri, 'python') - await getTestWindow().waitForMessage(/template.yaml already exist/) - await genPromise + await genWalkthroughProject('API', workspaceUri, 'python') // Then template should be overwritten assert.equal(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), true) assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo) + await config.update('enableCodeLenses', true, vscode.ConfigurationTarget.Global) }) })