more test deflaking (#4263)

SignalR · Nov 9, 2018 · 355310a · 355310a
1 parent 98fa28d
commit 355310a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/test/Microsoft.AspNet.SignalR.FunctionalTests/Client/ConnectionFacts.cs b/test/Microsoft.AspNet.SignalR.FunctionalTests/Client/ConnectionFacts.cs
@@ -153,7 +153,7 @@ public async Task ReconnectExceedingReconnectWindowDisconnects(HostType hostType
                     await connection.Start(host.Transport);
 
                     // Without this the connection start and reconnect can race with eachother resulting in a deadlock.
-                    Thread.Sleep(TimeSpan.FromSeconds(3));
+                    await Task.Delay(TimeSpan.FromSeconds(3));
 
                     host.Shutdown();
 

diff --git a/test/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs b/test/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs
@@ -1395,7 +1395,7 @@ public async Task RejoiningGroupsOnlyReceivesGroupsBelongingToHub()
                     var proxy = connection.CreateHubProxy("MultGroupHub");
                     var proxy2 = connection.CreateHubProxy("MultGroupHub2");
 
-                    await connection.Start(host);
+                    await connection.Start(host).OrTimeout();
 
                     var user = new User { Name = "tester" };
                     await proxy.Invoke("login", user).OrTimeout();
@@ -1409,14 +1409,14 @@ public async Task RejoiningGroupsOnlyReceivesGroupsBelongingToHub()
 
                     await Task.Delay(TimeSpan.FromSeconds(3));
 
-                    Assert.True(logRejoiningGroups.GroupsRejoined["MultGroupHub"].Contains("foo"));
-                    Assert.True(logRejoiningGroups.GroupsRejoined["MultGroupHub"].Contains("tester"));
-                    Assert.False(logRejoiningGroups.GroupsRejoined["MultGroupHub"].Contains("foo2"));
-                    Assert.False(logRejoiningGroups.GroupsRejoined["MultGroupHub"].Contains("tester2"));
-                    Assert.True(logRejoiningGroups.GroupsRejoined["MultGroupHub2"].Contains("foo2"));
-                    Assert.True(logRejoiningGroups.GroupsRejoined["MultGroupHub2"].Contains("tester2"));
-                    Assert.False(logRejoiningGroups.GroupsRejoined["MultGroupHub2"].Contains("foo"));
-                    Assert.False(logRejoiningGroups.GroupsRejoined["MultGroupHub2"].Contains("tester"));
+                    Assert.Contains("foo", logRejoiningGroups.GroupsRejoined["MultGroupHub"]);
+                    Assert.Contains("tester", logRejoiningGroups.GroupsRejoined["MultGroupHub"]);
+                    Assert.DoesNotContain("foo2", logRejoiningGroups.GroupsRejoined["MultGroupHub"]);
+                    Assert.DoesNotContain("tester2", logRejoiningGroups.GroupsRejoined["MultGroupHub"]);
+                    Assert.Contains("foo2", logRejoiningGroups.GroupsRejoined["MultGroupHub2"]);
+                    Assert.Contains("tester2", logRejoiningGroups.GroupsRejoined["MultGroupHub2"]);
+                    Assert.DoesNotContain("foo", logRejoiningGroups.GroupsRejoined["MultGroupHub2"]);
+                    Assert.DoesNotContain("tester", logRejoiningGroups.GroupsRejoined["MultGroupHub2"]);
                 }
             }
         }
@@ -1512,7 +1512,7 @@ public async Task ReturningNullFromConnectAndDisconnectAccepted()
                 var connection = new HubConnection("http://foo");
 
                 var hub = connection.CreateHubProxy("SomeHub");
-                await connection.Start(host);
+                await connection.Start(host).OrTimeout();
 
                 connection.Stop();
                 await Task.Delay(TimeSpan.FromSeconds(3));
@@ -1549,7 +1549,7 @@ public async Task ReturningNullFromReconnectAccepted()
                 var connection = new HubConnection("http://foo");
 
                 var hub = connection.CreateHubProxy("SomeHub");
-                await connection.Start(host);
+                await connection.Start(host).OrTimeout();
 
                 // Force Reconnect
                 await Task.Delay(TimeSpan.FromSeconds(3));

diff --git a/test/Microsoft.AspNet.SignalR.Tests.Common/Connections/AddGroupOnConnectedConnection.cs b/test/Microsoft.AspNet.SignalR.Tests.Common/Connections/AddGroupOnConnectedConnection.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -12,7 +12,7 @@ class AddGroupOnConnectedConnection : PersistentConnection
         protected override async Task OnConnected(IRequest request, string connectionId)
         {
             await Groups.Add(connectionId, "test");
-            Thread.Sleep(TimeSpan.FromSeconds(1));
+            await Task.Delay(TimeSpan.FromSeconds(1));
             await Groups.Add(connectionId, "test2");
         }