chore: even more integ tests fixes

- Properly pass on the `$STACK_NAME_PREFIX` to the CDK app, or the tests
and app will disagree on stack names.
- Change the app fixture setup to not be done for every individual
test. It won't be mutated anyway, and this saves a lot of time.
- Fix the 'generating and loading assembly test', it needed 2 synths.

packages/aws-cdk/test/integ/cli/bootstrapping.integtest.ts

@@ -3,8 +3,11 @@ import { cdk, cleanupOldStacks, fullStackName, prepareAppFixture } from './cdk-h
 
 jest.setTimeout(600 * 1000);
 
-beforeEach(async () => {
+beforeAll(async () => {
   await prepareAppFixture();
+});
+
+beforeEach(async () => {
   await cleanupOldStacks();
 });
 

packages/aws-cdk/test/integ/cli/cdk-helpers.ts

@@ -70,6 +70,7 @@ export async function cdk(args: string[], options: CdkCliOptions = {}) {
     modEnv: {
       AWS_REGION: (await testEnv()).region,
       AWS_DEFAULT_REGION: (await testEnv()).region,
+      STACK_NAME_PREFIX,
       ...options.modEnv,
     },
   });

packages/aws-cdk/test/integ/cli/cli.integtest.ts

@@ -1,14 +1,17 @@
 import { promises as fs } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { afterSeconds, cloudFormation, iam, lambda, retry, sns, sts, testEnv } from './aws-helpers';
+import { afterSeconds, cloudFormation, iam, lambda, retry, sleep, sns, sts, testEnv } from './aws-helpers';
 import { cdk, cdkDeploy, cdkDestroy, cleanupOldStacks, cloneDirectory, fullStackName,
   INTEG_TEST_DIR, log, prepareAppFixture, shell, STACK_NAME_PREFIX } from './cdk-helpers';
 
 jest.setTimeout(600 * 1000);
 
-beforeEach(async () => {
+beforeAll(async () => {
   await prepareAppFixture();
+});
+
+beforeEach(async () => {
   await cleanupOldStacks();
 });
 
@@ -304,6 +307,11 @@ test('deploy with role', async () => {
       });
     });
 
+    // In principle, the role has replicated from 'us-east-1' to wherever we're testing.
+    // Give it a little more sleep to make sure CloudFormation is not hitting a box
+    // that doesn't have it yet.
+    await sleep(5000);
+
     await cdkDeploy('test-2', {
       options: ['--role-arn', roleArn],
     });
@@ -502,10 +510,14 @@ test('generating and loading assembly', async () => {
   const asmOutputDir = path.join(os.tmpdir(), 'cdk-integ-asm');
   await shell(['rm', '-rf', asmOutputDir]);
 
-  // Synthesize a Cloud Assembly
+  // Make sure our fixture directory is clean
+  await prepareAppFixture();
+
+  // Synthesize a Cloud Assembly tothe default directory (cdk.out) and a specific directory.
+  await cdk(['synth']);
   await cdk(['synth', '--output', asmOutputDir]);
 
-  // cdk.out in the current direc,tory and the indicated --output should be the same
+  // cdk.out in the current directory and the indicated --output should be the same
   await shell(['diff', 'cdk.out', asmOutputDir], {
     cwd: INTEG_TEST_DIR,
   });