Fix tests on CodeBuild

zoewangg · zoewangg · commit 37fd0db4ad09 · 2021-10-22T11:46:26.000-07:00
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/AutoDefaultsModeDiscoveryTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/AutoDefaultsModeDiscoveryTest.java
@@ -108,14 +108,20 @@ public void differentCombinationOfConfigs_shouldResolveCorrectly() throws Except
         if (testData.awsExecutionEnvVar != null) {
             ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_EXECUTION_ENV.environmentVariable(),
                                             testData.awsExecutionEnvVar);
+        } else {
+            ENVIRONMENT_VARIABLE_HELPER.remove(SdkSystemSetting.AWS_EXECUTION_ENV.environmentVariable());
         }
 
         if (testData.awsRegionEnvVar != null) {
             ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_REGION.environmentVariable(), testData.awsRegionEnvVar);
+        } else {
+            ENVIRONMENT_VARIABLE_HELPER.remove(SdkSystemSetting.AWS_REGION.environmentVariable());
         }
 
         if (testData.awsDefaultRegionEnvVar != null) {
             ENVIRONMENT_VARIABLE_HELPER.set("AWS_DEFAULT_REGION", testData.awsDefaultRegionEnvVar);
+        } else {
+            ENVIRONMENT_VARIABLE_HELPER.remove("AWS_DEFAULT_REGION");
         }
 
         if (testData.ec2MetadataConfig != null) {

Original file line number	Diff line number	Diff line change
`@@ -108,14 +108,20 @@ public void differentCombinationOfConfigs_shouldResolveCorrectly() throws Except`
`108`	`108`	`if (testData.awsExecutionEnvVar != null) {`
`109`	`109`	`ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_EXECUTION_ENV.environmentVariable(),`
`110`	`110`	`testData.awsExecutionEnvVar);`
	`111`	`+ } else {`
	`112`	`+ ENVIRONMENT_VARIABLE_HELPER.remove(SdkSystemSetting.AWS_EXECUTION_ENV.environmentVariable());`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`if (testData.awsRegionEnvVar != null) {`
`114`	`116`	`ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_REGION.environmentVariable(), testData.awsRegionEnvVar);`
	`117`	`+ } else {`
	`118`	`+ ENVIRONMENT_VARIABLE_HELPER.remove(SdkSystemSetting.AWS_REGION.environmentVariable());`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`if (testData.awsDefaultRegionEnvVar != null) {`
`118`	`122`	`ENVIRONMENT_VARIABLE_HELPER.set("AWS_DEFAULT_REGION", testData.awsDefaultRegionEnvVar);`
	`123`	`+ } else {`
	`124`	`+ ENVIRONMENT_VARIABLE_HELPER.remove("AWS_DEFAULT_REGION");`
`119`	`125`	`}`
`120`	`126`
`121`	`127`	`if (testData.ec2MetadataConfig != null) {`