Fix tests.

Author: DmitryLukyanov

evergreen/evergreen.yml

@@ -629,7 +629,7 @@ functions:
     - command: shell.exec
       type: test
       params:
-        #silent: true
+        silent: true
         working_dir: mongo-csharp-driver
         script: |
           # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)

evergreen/run-mongodb-aws-ecs-test.sh

@@ -28,7 +28,7 @@ fi
 # Now we can safely enable xtrace
 set -o xtrace
 export AWS_TESTS_ENABLED=true
-export AWS_ECS_TEST=true
+export AWS_ECS_ENABLED=true
 
 # EG scripts for ECS assume that a root folder is "src" and all driver side scripts are placed in ".evergreen" folder. 
 # So that script is copied into "src/.evergreen" before running

tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs

@@ -63,17 +63,17 @@ public void Aws_authentication_should_should_have_expected_result()
         [SkippableFact]
         public void Ecs_should_fill_AWS_CONTAINER_CREDENTIALS_RELATIVE_URI()
         {
-            var isEcs = Environment.GetEnvironmentVariable("AWS_ECS_TEST") != null;
+            var isEcs = Environment.GetEnvironmentVariable("AWS_ECS_ENABLED") != null;
             var awsContainerRelativeUri = Environment.GetEnvironmentVariable("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI");
-            awsContainerRelativeUri.Should().Match(v => isEcs ? v != null : v == null);
+            (awsContainerRelativeUri != null).Should().Be(isEcs);
         }
 
         [SkippableFact]
-        public void AwsSdk_should_support_all_required_callbacks()
+        public void AwsSdk_should_support_all_required_handlers()
         {
             var credentialsGeneratorsDelegatesEnumerator = FallbackCredentialsFactory.CredentialsGenerators.GetEnumerator();
 
-            // Attempt 1
+            // AppConfigAWSCredentials
             AWSCredentials credentials = null;
             if (Type.GetType("Amazon.Runtime.AppConfigAWSCredentials", throwOnError: false) != null)
             {
@@ -82,6 +82,7 @@ public void AwsSdk_should_support_all_required_callbacks()
                 appConfigAWSCredentialsException.Message.Should().Contain("The app.config/web.config files for the application did not contain credential information");
             }
 
+            // AssumeRoleWithWebIdentityCredentials.FromEnvironmentVariables()
             var exception = Record.Exception(() => RunTestCase());
             if (Environment.GetEnvironmentVariable("AWS_WEB_IDENTITY_TOKEN_FILE") != null)
             {
@@ -95,7 +96,7 @@ public void AwsSdk_should_support_all_required_callbacks()
                 exception.Message.Should().Contain("webIdentityTokenFile");
             }
 
-            // Attempt 2
+            // GetAWSCredentials (Profile)
             exception = Record.Exception(() => RunTestCase());
             if (IsWithAwsProfileOnMachine())
             {
@@ -106,26 +107,24 @@ public void AwsSdk_should_support_all_required_callbacks()
             else
             {
                 // otherwise fail
-                exception.Message.Should().Contain("Credential profile ").And.Subject.Should().Contain("is not valid");
+                exception.Message.Should().Contain("Credential").And.Subject.Should().Contain("profile");
             }
 
-            // Attempt 3
-            credentialsGeneratorsDelegatesEnumerator.MoveNext().Should().BeTrue();
+            // EnvironmentVariablesAWSCredentials
             exception = Record.Exception(() => RunTestCase());
             if (Environment.GetEnvironmentVariable("AWS_ACCESS_KEY_ID") != null && Environment.GetEnvironmentVariable("AWS_SECRET_ACCESS_KEY") != null)
             {
                 // environment variables code path
                 exception.Should().BeNull();
-                credentials.Should().BeOfType<ImmutableCredentials>();
+                credentials.Should().BeOfType<EnvironmentVariablesAWSCredentials>();
             }
             else
             {
                 // otherwise fail
                 exception.Message.Should().Contain("The environment variables").And.Subject.Contains("were not set with AWS credentials");
             }
 
-            // Attempt 4
-            credentialsGeneratorsDelegatesEnumerator.MoveNext().Should().BeTrue();
+            // ECSEC2CredentialsWrapper
             exception = Record.Exception(() => RunTestCase());
             if (Environment.GetEnvironmentVariable("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI") != null || Environment.GetEnvironmentVariable("AWS_CONTAINER_CREDENTIALS_FULL_URI") != null)
             {