Set timeouts on observable awaits

Author: shana

test/TrackingCollectionTests/TrackingCollectionTests.cs

@@ -18,6 +18,8 @@
 [TestFixture]
 public class TrackingTests : TestBase
 {
+    const int Timeout = 2000;
+
 #if !DISABLE_REACTIVE_UI
     [OneTimeSetUp]
     public void Setup()
@@ -1907,7 +1909,7 @@ public async Task MultipleSortingAndFiltering()
         col.NewerComparer = OrderedComparer<Thing>.OrderByDescending(x => x.UpdatedAt).Compare;
         col.Subscribe();
 
-        await col.OriginalCompleted;
+        await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));
 
         // it's initially sorted by date, so id list should not match
         CollectionAssert.AreNotEqual(list1.Select(x => x.Number).ToEnumerable(), list2.Select(x => x.Number).ToEnumerable());
@@ -1944,7 +1946,7 @@ public async Task MultipleSortingAndFiltering()
     }
 
     [Test]
-    public void ListeningTwiceWorks()
+    public async Task ListeningTwiceWorks()
     {
         var count = 10;
         ITrackingCollection<Thing> col = new TrackingCollection<Thing>();
@@ -1954,13 +1956,15 @@ public void ListeningTwiceWorks()
         var list1 = new List<Thing>(Enumerable.Range(1, count).Select(i => GetThing(i, i, count - i, "Run 1")).ToList());
         var list2 = new List<Thing>(Enumerable.Range(1, count).Select(i => GetThing(i, i, i + count, "Run 2")).ToList());
 
+#pragma warning disable 4014
         col.Listen(list1.ToObservable());
         col.Subscribe();
-        col.OriginalCompleted.Wait();
+        await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));
 
         col.Listen(list2.ToObservable());
         col.Subscribe();
-        col.OriginalCompleted.Wait();
+        await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));
+#pragma warning restore 4014
 
         CollectionAssert.AreEqual(list2, col);
     }
@@ -1980,7 +1984,7 @@ public void RemovingWithNoObservableSetThrows()
     }
 
     [Test]
-    public async void AddingBeforeSubscribingWorks()
+    public async Task AddingBeforeSubscribingWorks()
     {
         ITrackingCollection<Thing> col = new TrackingCollection<Thing>(Observable.Empty<Thing>());
         ReplaySubject<Thing> done = new ReplaySubject<Thing>();
@@ -1995,7 +1999,7 @@ public async void AddingBeforeSubscribingWorks()
                 done.OnCompleted();
         }, () => {});
 
-        await Observable.Timeout(done, TimeSpan.FromMilliseconds(500));
+        await done.Timeout(TimeSpan.FromMilliseconds(500));
         Assert.AreEqual(2, col.Count);
     }
 

test/UnitTests/GitHub.App/Models/ModelServiceTests.cs

@@ -23,6 +23,7 @@
 
 public class ModelServiceTests
 {
+    const int Timeout = 2000;
     public class TheGetCurrentUserMethod : TestBaseClass
     {
         [Test]
@@ -421,7 +422,7 @@ public async Task NonExpiredIndexReturnsCache()
             col.ProcessingDelay = TimeSpan.Zero;
 
             col.Subscribe();
-            await col.OriginalCompleted;
+            await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));;
 
             Assert.That(expected, Is.EqualTo(col.Count));
             //Assert.Collection(col, col.Select(x => new Action<IPullRequestModel>(t => Assert.That("Cache", StartsWith(x.Title)))).ToArray());

test/UnitTests/GitHub.App/ViewModels/Dialog/RepositoryCloneViewModelTests.cs

@@ -17,6 +17,8 @@
 
 public class RepositoryCloneViewModelTests
 {
+    const int Timeout = 2000;
+
     static RepositoryCloneViewModel GetVM(IModelService modelService, IRepositoryCloneService cloneService, IOperatingSystem os)
     {
         var connection = Substitute.For<IConnection>();
@@ -70,7 +72,7 @@ public async Task LoadsRepositories()
                 Substitute.For<IOperatingSystem>());
 
             var col = (ITrackingCollection<IRemoteRepositoryModel>)vm.Repositories;
-            await col.OriginalCompleted;
+            await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));
             Assert.That(3, Is.EqualTo(vm.Repositories.Count));
         }
     }
@@ -102,14 +104,14 @@ public async Task StartsTrueBecomesFalseWhenCompleted()
             repoSubject.OnNext(Substitute.For<IRemoteRepositoryModel>());
             repoSubject.OnNext(Substitute.For<IRemoteRepositoryModel>());
 
-            await done;
+            await done.Timeout(TimeSpan.FromMilliseconds(500));
             done = null;
 
             Assert.True(vm.IsBusy);
 
             repoSubject.OnCompleted();
 
-            await col.OriginalCompleted;
+            await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));;
 
             // we need to wait slightly because the subscription OnComplete in the model
             // runs right after the above await finishes, which means the assert
@@ -185,7 +187,7 @@ public async Task IsFalseWhenLoadingAndCompletedWithRepository()
             repoSubject.OnCompleted();
 
             var col = (ITrackingCollection<IRemoteRepositoryModel>)vm.Repositories;
-            await col.OriginalCompleted;
+            await col.OriginalCompleted.Timeout(TimeSpan.FromMilliseconds(Timeout));
             //Assert.Single(vm.Repositories);
             Assert.False(vm.NoRepositoriesFound);
         }