Make tests less likely to fail due to resources not having been delet…

…ed (yet)
cartwrightian · Mar 8, 2022 · ecbda4a · ecbda4a
1 parent 5eae480
commit ecbda4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/cfnScripts/subnetWithS3Param.json b/src/cfnScripts/subnetWithS3Param.json
@@ -28,7 +28,7 @@
 				"AvailabilityZone":{
 					"Ref":"zoneA"
 				},
-				"CidrBlock":"10.0.10.0/24",
+				"CidrBlock":"10.0.43.0/24",
 				"Tags":[
 					{
 						"Key":"Name",

diff --git a/test/tw/com/acceptance/TestCommandLineS3Operations.java b/test/tw/com/acceptance/TestCommandLineS3Operations.java
@@ -61,7 +61,8 @@ public void beforeEveryTestRun() {
 		deletesStacks.ifPresent(EnvironmentSetupForTests.TEMPORARY_STACK)
 			.ifPresent("CfnAssistTest01createSubnet")
 			.ifPresent("CfnAssistTest02createAcls")
-			.ifPresent("CfnAssistTestsimpleStack");
+			.ifPresent("CfnAssistTestsimpleStack")
+			.ifPresent("CfnAssist9987TestsubnetWithS3Param");
 		deletesStacks.act();
 		testName = test.getMethodName();
 	}
@@ -72,7 +73,7 @@ private void deleteTestKeysFromBucket() {
 			s3Client.deleteObject(DeleteObjectRequest.builder().bucket(EnvironmentSetupForTests.BUCKET_NAME).key(KEY_B).build());
 		} 
 		catch(S3Exception exception) {
-			System.out.println(exception);
+			System.out.println(exception.toString());
 		}	
 	}
 

diff --git a/test/tw/com/acceptance/TestCommandLineStackOperations.java b/test/tw/com/acceptance/TestCommandLineStackOperations.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
 
@@ -44,20 +45,21 @@ public static void beforeAllTestsRun() {
 	String testName = "";
 
 	@Rule
-    public Timeout globalTimeout = new Timeout(5*60*1000);
+    public Timeout globalTimeout = new Timeout(5*60, TimeUnit.SECONDS);
 
 	@Before
 	public void beforeEveryTestRun() {
 		vpcRepository = new VpcRepository(new CloudClient(ec2Client, new DefaultAwsRegionProviderChain()));
 		altProjectAndEnv = EnvironmentSetupForTests.getAltProjectAndEnv();
-		EnvironmentSetupForTests.getMainProjectAndEnv();
+//		EnvironmentSetupForTests.getMainProjectAndEnv();
 
 		altEnvVPC = EnvironmentSetupForTests.findAltVpc(vpcRepository);	
 		deletesStacks = new DeletesStacks(cfnClient);
 		deletesStacks.ifPresent(EnvironmentSetupForTests.TEMPORARY_STACK)
 			.ifPresent("CfnAssistTest01createSubnet")
 			.ifPresent("CfnAssistTest02createAcls")
 			.ifPresent("CfnAssistTestsimpleStack")
+			.ifPresent("CfnAssistTestsubnetWithParam")
 			.ifPresent("CfnAssistTestsubnet")
 			.ifPresent("CfnAssist876TestelbAndInstance")
             .ifPresent("CfnAssistTestsimpleStackWithAZ");
@@ -108,7 +110,7 @@ public void testListStacks() {
 
 		System.setOut(origStream);
 
-		String outputText = new String(stream.toByteArray(), Charset.defaultCharset());
+		String outputText = stream.toString(Charset.defaultCharset());
 		CLIArgBuilder.checkForExpectedLine(outputText, "CfnAssistTestsimpleStack", "CfnAssist", "Test", StackStatus.CREATE_COMPLETE.toString());
 
 		deletesStacks.ifPresent("CfnAssistTestsimpleStack");