Fix failing sync tests

.github/templates/pr.yml

@@ -47,4 +47,4 @@ jobs:
     uses: ./.github/workflows/test-weaver.yml
     name: Test
   _: #@ template.replace(runTests("Code Coverage"))
-  _: #@ template.replace(cleanupBaas(["Code Coverage"]))
+  _: #@ template.replace(cleanupBaas(["Code Coverage"]))

.github/templates/test-code-coverage.yml

@@ -9,7 +9,7 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     name: Code Coverage
-    timeout-minutes: 45
+    timeout-minutes: 90
     steps:
       - #@ setupDotnet()
       - #@ template.replace(prepareTest(fetchWrappers=True))

.github/templates/test-ios.yml

@@ -9,7 +9,7 @@ jobs:
   test-xamarin:
     runs-on: macos-latest
     name: Xamarin.iOS
-    timeout-minutes: 45
+    timeout-minutes: 90
     steps:
       - #@ template.replace(prepareTest())
       - #@ template.replace(buildTests("Tests/Tests.iOS", Platform="iPhoneSimulator"))

.github/workflows/deploy-baas.yml

@@ -45,7 +45,7 @@ jobs:
         atlasUrl: ${{ inputs.AtlasBaseUrl}}
         apiKey: ${{ secrets.AtlasPublicKey}}
         privateApiKey: ${{ secrets.AtlasPrivateKey }}
-        clusterSize: M10
+        clusterSize: M20
   deploy-apps:
     name: Deploy Apps
     needs: deploy-baas

.github/workflows/test-code-coverage.yml

@@ -28,7 +28,7 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     name: Code Coverage
-    timeout-minutes: 45
+    timeout-minutes: 90
     steps:
     - name: Configure .NET
       uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a

.github/workflows/test-ios.yml

@@ -28,7 +28,7 @@ jobs:
   test-xamarin:
     runs-on: macos-latest
     name: Xamarin.iOS
-    timeout-minutes: 45
+    timeout-minutes: 90
     steps:
     - name: Checkout code
       uses: actions/checkout@v3

Realm/Realm/Extensions/TaskExtensions.cs

@@ -22,25 +22,31 @@
 
 internal static class TaskExtensions
 {
-    public static Task<T> Timeout<T>(this Task<T> task, int millisecondTimeout)
+    public static Task<T> Timeout<T>(this Task<T> task, int millisecondTimeout, string detail = null)
     {
         return Task.WhenAny(task, Task.Delay(millisecondTimeout)).ContinueWith(t =>
         {
-            if (t.Result == task)
+            if (t.Result != task)
             {
-                if (task.IsFaulted)
+                var errorMessage = $"The operation has timed out after {millisecondTimeout} ms.";
+                if (detail != null)
                 {
-                    throw task.Exception.InnerException;
+                    errorMessage += $" {detail}";
                 }
 
-                return task.Result;
+                throw new TimeoutException(errorMessage);
             }
 
-            throw new TimeoutException($"The operation has timed out after {millisecondTimeout} ms.");
+            if (task.IsFaulted)
+            {
+                throw task.Exception.InnerException;
+            }
+
+            return task.Result;
         });
     }
 
-    public static async Task Timeout(this Task task, int millisecondTimeout, Task errorTask = null)
+    public static async Task Timeout(this Task task, int millisecondTimeout, Task errorTask = null, string detail = null)
     {
         var tasks = new List<Task> { task, Task.Delay(millisecondTimeout) };
         if (errorTask != null)
@@ -51,7 +57,13 @@ public static async Task Timeout(this Task task, int millisecondTimeout, Task er
         var completed = await Task.WhenAny(tasks);
         if (completed != task && completed != errorTask)
         {
-            throw new TimeoutException($"The operation has timed out after {millisecondTimeout} ms.");
+            var errorMessage = $"The operation has timed out after {millisecondTimeout} ms.";
+            if (detail != null)
+            {
+                errorMessage += $" {detail}";
+            }
+
+            throw new TimeoutException(errorMessage);
         }
 
         await completed;

Realm/Realm/Handles/SubscriptionSetHandle.cs

@@ -269,6 +269,10 @@ public async Task<SubscriptionSetState> WaitForStateChangeAsync()
 
                 return await tcs.Task;
             }
+            catch (Exception ex) when (ex.Message == "Active SubscriptionSet without a SubscriptionStore")
+            {
+                throw new TaskCanceledException("The SubscriptionSet was closed before the wait could complete. This is likely because the Realm it belongs to was disposed.");
+            }
             finally
             {
                 tcsHandle.Free();
@@ -327,7 +331,7 @@ private static void HandleStateWaitCallback(IntPtr taskCompletionSource, Subscri
                     tcs.TrySetResult(state);
                     break;
                 case RealmValueType.Int when message.AsInt() == -1:
-                    tcs.TrySetCanceled();
+                    tcs.TrySetException(new TaskCanceledException("The SubscriptionSet was closed before the wait could complete. This is likely because the Realm it belongs to was disposed."));
                     break;
                 default:
                     tcs.TrySetException(new SubscriptionException(message.AsString()));

Realm/Realm/Logging/Logger.cs

@@ -17,8 +17,11 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System;
+using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Realms.Sync;
 
 namespace Realms.Logging
@@ -165,7 +168,7 @@ protected override void LogImpl(LogLevel level, string message)
 
         private class FileLogger : Logger
         {
-            private readonly object locker = new object();
+            private readonly object locker = new();
             private readonly string _filePath;
             private readonly Encoding _encoding;
 
@@ -205,7 +208,7 @@ protected override void LogImpl(LogLevel level, string message)
 
         internal class InMemoryLogger : Logger
         {
-            private readonly StringBuilder _builder = new StringBuilder();
+            private readonly StringBuilder _builder = new();
 
             protected override void LogImpl(LogLevel level, string message)
             {
@@ -225,5 +228,63 @@ public string GetLog()
 
             public void Clear() => _builder.Clear();
         }
+
+        internal class AsyncFileLogger : Logger, IDisposable
+        {
+            private readonly ConcurrentQueue<string> _queue = new();
+            private readonly string _filePath;
+            private readonly Encoding _encoding;
+            private readonly AutoResetEvent _hasNewItems = new(false);
+            private readonly AutoResetEvent _flush = new(false);
+            private readonly Task _runner;
+            private volatile bool _isFlushing;
+
+            public AsyncFileLogger(string filePath, Encoding encoding = null)
+            {
+                _filePath = filePath;
+                _encoding = encoding ?? Encoding.UTF8;
+                _runner = Task.Run(Run);
+            }
+
+            public void Dispose()
+            {
+                _isFlushing = true;
+                _flush.Set();
+                _runner.Wait();
+
+                _hasNewItems.Dispose();
+                _flush.Dispose();
+            }
+
+            protected override void LogImpl(LogLevel level, string message)
+            {
+                if (!_isFlushing)
+                {
+                    _queue.Enqueue(FormatLog(level, message));
+                    _hasNewItems.Set();
+                }
+            }
+
+            private void Run()
+            {
+                var sb = new StringBuilder();
+                while (true)
+                {
+                    sb.Clear();
+                    WaitHandle.WaitAny(new[] { _hasNewItems, _flush });
+                    while (_queue.TryDequeue(out var item))
+                    {
+                        sb.AppendLine(item);
+                    }
+
+                    System.IO.File.AppendAllText(_filePath, sb.ToString(), _encoding);
+
+                    if (_isFlushing)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
     }
 }

Realm/Realm/Realm.cs

@@ -429,11 +429,7 @@ public void Dispose()
             if (!IsClosed)
             {
                 _activeTransaction?.Dispose();
-
-                if (SharedRealmHandle.OwnsNativeRealm)
-                {
-                    _state.RemoveRealm(this);
-                }
+                _state.RemoveRealm(this, closeOnEmpty: SharedRealmHandle.OwnsNativeRealm);
 
                 _state = null;
                 SharedRealmHandle.Close();  // Note: this closes the *handle*, it does not trigger realm::Realm::close().
@@ -1708,14 +1704,14 @@ public void AddRealm(Realm realm)
             /// 4. Once the last instance is deleted, the CSharpBindingContext destructor is called, which frees the state GCHandle.
             /// 5. The State is now eligible for collection, and its fields will be GC-ed.
             /// </summary>
-            public void RemoveRealm(Realm realm)
+            public void RemoveRealm(Realm realm, bool closeOnEmpty)
             {
                 _weakRealms.RemoveAll(r =>
                 {
                     return !r.TryGetTarget(out var other) || ReferenceEquals(realm, other);
                 });
 
-                if (!_weakRealms.Any())
+                if (closeOnEmpty && !_weakRealms.Any())
                 {
                     realm.SharedRealmHandle.CloseRealm();
                 }

Tests/Realm.Tests/Database/InstanceTests.cs

@@ -617,7 +617,7 @@ public void GetInstanceAsync_ExecutesMigrationsInBackground()
                 var sw = new Stopwatch();
                 sw.Start();
 
-                using var realm = await GetRealmAsync(config).Timeout(1000);
+                using var realm = await GetRealmAsync(config, 1000);
 
                 sw.Stop();
 

Tests/Realm.Tests/Database/NotificationTests.cs

@@ -57,14 +57,11 @@ public void ShouldTriggerRealmChangedEvent()
         [Test]
         public void RealmError_WhenNoSubscribers_OutputsMessageInConsole()
         {
-            using var sw = new StringWriter();
-            var original = Logger.Default;
-
-            Logger.Default = Logger.Function(sw.WriteLine);
+            var logger = new Logger.InMemoryLogger();
+            Logger.Default = logger;
             _realm.NotifyError(new Exception());
 
-            Assert.That(sw.ToString(), Does.Contain("exception").And.Contains("Realm.Error"));
-            Logger.Default = original;
+            Assert.That(logger.GetLog(), Does.Contain("exception").And.Contains("Realm.Error"));
         }
 
         [Test]

Tests/Realm.Tests/Generated/Realm.SourceGenerator/Realms.SourceGenerator.RealmGenerator/ObjectWithPartitionValue_generated.cs

@@ -16,7 +16,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -41,6 +40,8 @@ public partial class ObjectWithPartitionValue : IRealmObject, INotifyPropertyCha
             Realms.Schema.Property.Primitive("Guid", Realms.RealmValueType.Guid, isPrimaryKey: false, isIndexed: false, isNullable: false, managedName: "Guid"),
         }.Build();
 
+        private ObjectWithPartitionValue() {}
+
         #region IRealmObject implementation
 
         private IObjectWithPartitionValueAccessor _accessor;
@@ -283,7 +284,7 @@ internal class ObjectWithPartitionValueUnmanagedAccessor : Realms.UnmanagedAcces
         {
             public override ObjectSchema ObjectSchema => ObjectWithPartitionValue.RealmSchema;
 
-            private string _id;
+            private string _id = Guid.NewGuid().ToString();
             public string Id
             {
                 get => _id;

Tests/Realm.Tests/Generated/Realm.SourceGenerator/Realms.SourceGenerator.RealmGenerator/SyncObjectWithRequiredStringList_generated.cs

@@ -16,7 +16,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;

Tests/Realm.Tests/Program.cs

@@ -31,16 +31,20 @@ public static int Main(string[] args)
             Console.WriteLine($"Running on {RuntimeInformation.OSDescription} / CPU {RuntimeInformation.ProcessArchitecture} / Framework {RuntimeInformation.FrameworkDescription}");
 
             var autorun = new AutoRun(typeof(Program).GetTypeInfo().Assembly);
-            var arguments = Sync.SyncTestHelpers.ExtractBaasSettings(args);
+            IDisposable logger = null;
+            (args, logger) = Sync.SyncTestHelpers.SetLoggerFromArgs(args);
+            args = Sync.SyncTestHelpers.ExtractBaasSettings(args);
 
-            autorun.Execute(arguments);
+            autorun.Execute(args);
 
             var resultPath = args.FirstOrDefault(a => a.StartsWith("--result="))?.Replace("--result=", string.Empty);
             if (!string.IsNullOrEmpty(resultPath))
             {
                 TestHelpers.TransformTestResults(resultPath);
             }
 
+            logger?.Dispose();
+
             return 0;
         }
     }