CSHARP-3807: XUnit custom timeouts infrastructure

Author: BorisDog

build.cake

@@ -155,13 +155,15 @@ Task("Test")
 
         var testResultsFile = outputDirectory.Combine("test-results").Combine($"TEST-{target.ToLowerInvariant()}-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}.xml");
         // Evergreen CI server requires JUnit output format to display test results
-        var logger = $"junit;LogFilePath={testResultsFile};FailureBodyFormat=Verbose";
+        var junitLogger = $"junit;LogFilePath={testResultsFile};FailureBodyFormat=Verbose";
+        var consoleLogger = "console;verbosity=detailed";
+        
         var settings = new DotNetCoreTestSettings
         {
             NoBuild = true,
             NoRestore = true,
             Configuration = configuration,
-            Logger = logger,
+            Loggers = new string[] { consoleLogger, junitLogger },
             ArgumentCustomization = args => args.Append("-- RunConfiguration.TargetPlatform=x64")
         };
         switch (target.ToLowerInvariant()) // target can be not only moniker related

evergreen/evergreen.yml

@@ -13,8 +13,8 @@ stepback: true
 command_type: system
 
 # Protect ourself against rogue test case, or curl gone wild, that runs forever
-# 12 minutes is the longest we'll ever run
-exec_timeout_secs: 1800
+# 45 minutes: 20 minutes is a normal test run + up to 10 minutes for test setup + 15 minutes for longer macOS tests
+exec_timeout_secs: 2700
 
 # What to do when evergreen hits the timeout (`post:` tasks are run automatically)
 timeout:

tests/AtlasConnectivity.Tests/ConnectivityTests.cs

@@ -17,13 +17,22 @@
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Driver;
+using MongoDB.Driver.Core.TestHelpers.Logging;
 using MongoDB.Driver.TestHelpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace AtlasConnectivity.Tests
 {
-    public class ConnectivityTests
+    public class ConnectivityTests : LoggableTestClass
     {
+        // public constructors
+        public ConnectivityTests(ITestOutputHelper testOutputHelper)
+            : base(testOutputHelper)
+        {
+        }
+
+        // public methods
         [Theory]
         [InlineData("ATLAS_FREE")]
         [InlineData("ATLAS_FREE_SRV")]
@@ -62,7 +71,7 @@ private DisposableMongoClient CreateDisposableClient(string connectionString)
         {
             var clientSettings = MongoClientSettings.FromUrl(new MongoUrl(connectionString));
             var client = new MongoClient(clientSettings);
-            return new DisposableMongoClient(client);
+            return new DisposableMongoClient(client, CreateLogger<DisposableMongoClient>());
         }
     }
 }

tests/AtlasConnectivity.Tests/xunit.runner.json

@@ -1,5 +1,5 @@
 {
-  "longRunningTestSeconds": 1800,
+  "longRunningTestSeconds": 10,
   "parallelizeAssembly": false,
   "parallelizeTestCollections": false
 }

tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="FluentAssertions" Version="4.12.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
     <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
   </ItemGroup>
 

tests/MongoDB.Bson.Tests/xunit.runner.json

@@ -1,5 +1,5 @@
 {
-  "longRunningTestSeconds": 1800,
+  "longRunningTestSeconds": 10,
   "parallelizeAssembly": false,
   "parallelizeTestCollections": false
 }

tests/MongoDB.Driver.Core.TestHelpers/CoreTestConfiguration.cs

@@ -51,6 +51,8 @@ public static class CoreTestConfiguration
         private static Lazy<string> __storageEngine = new Lazy<string>(GetStorageEngine, isThreadSafe: true);
         private static TraceSource __traceSource;
 
+        public static TimeSpan DefaultTestTimeout { get; } = TimeSpan.FromMinutes(3);
+
         // static properties
         public static ICluster Cluster
         {

tests/MongoDB.Driver.Core.TestHelpers/Logging/ILogger.cs

@@ -0,0 +1,26 @@
+/* Copyright 2021-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+namespace MongoDB.Driver.Core.TestHelpers.Logging
+{
+    public interface ILogger
+    {
+        public void Log(LogLevel logLevel, string decoration, string format, params object[] arguments);
+    }
+
+    public interface ILogger<TCategory> : ILogger
+    {
+    }
+}

tests/MongoDB.Driver.Core.TestHelpers/Logging/ILoggerExtensions.cs

@@ -0,0 +1,59 @@
+/* Copyright 2021-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+namespace MongoDB.Driver.Core.TestHelpers.Logging
+{
+    public static class ILoggerExtensions
+    {
+        public static ILogger<T> Decorate<T>(this ILogger<T> logger, string decoration) =>
+            logger != null ? new LoggerDecorator<T>(logger, decoration) : null;
+
+        public static void Error(this ILogger logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Error, null, format, arguments);
+
+        public static void Error<T>(this ILogger<T> logger, string message, params object[] arguments) =>
+            logger?.Log(LogLevel.Error, null, message, arguments);
+
+        public static void Warning(this ILogger logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Warning, null, format, arguments);
+
+        public static void Warning<T>(this ILogger<T> logger, string message, params object[] arguments) =>
+            logger?.Log(LogLevel.Warning, null, message, arguments);
+
+        public static void Info(this ILogger logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Information, null, format, arguments);
+
+        public static void Info<T>(this ILogger<T> logger, string message, params object[] arguments) =>
+            logger?.Log(LogLevel.Information, null, message, arguments);
+
+        public static void Debug(this ILogger logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Debug, null, format, arguments);
+
+        public static void Debug<T>(this ILogger<T> logger, string message, params object[] arguments) =>
+            logger?.Log(LogLevel.Debug, null, message, arguments);
+
+        public static void Trace(this ILogger logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Trace, null, format, arguments);
+
+        public static void Trace<T>(this ILogger<T> logger, string format, params object[] arguments) =>
+            logger?.Log(LogLevel.Trace, null, format, arguments);
+    }
+
+    internal static class ILoggerFactoryExtensions
+    {
+        public static ILogger<TCategory> CreateLogger<TCategory>(this ILoggerFactory loggerFactory, string decoration) =>
+            loggerFactory?.CreateLogger<TCategory>().Decorate(decoration);
+    }
+}

tests/MongoDB.Driver.Core.TestHelpers/Logging/ILoggerFactory.cs

@@ -0,0 +1,22 @@
+/* Copyright 2021-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+namespace MongoDB.Driver.Core.TestHelpers.Logging
+{
+    public interface ILoggerFactory
+    {
+        public ILogger<TCategory> CreateLogger<TCategory>();
+    }
+}