Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
git show --cc cc5b002a
commit cc5b002a5140e2d60184de42554a8737981c846c
Merge: 4d02bc5 34bdb41
Author: David Fowler <davidfowl@gmail.com>
Date: Thu Nov 22 11:28:35 2012 -0800
Merge branch 'release' into dev
diff --cc tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/HubProxyFacts.cs
index aaad4c4,8bf42fc..4979ab7
--- a/tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/HubProxyFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/HubProxyFacts.cs
@@@ -36,11 -36,9 +37,11 @@@ namespace Microsoft.AspNet.SignalR.Test
hubConnection.Start(host.Transport).Wait();
- proxy.Invoke("Send", "hello").Wait();
+ proxy.InvokeWithTimeout("Send", "hello");
- Assert.True(wh.WaitOne(TimeSpan.FromSeconds(5)));
+ Assert.True(wh.WaitOne(TimeSpan.FromSeconds(10)));
+
+ hubConnection.Stop();
}
}
@@@ -65,9 -63,9 +66,9 @@@
hubConnection.Start(host.Transport).Wait();
- proxy.Invoke("Send", "hello").Wait();
+ proxy.InvokeWithTimeout("Send", "hello");
- Assert.True(wh.WaitOne(TimeSpan.FromSeconds(5)));
+ Assert.True(wh.WaitOne(TimeSpan.FromSeconds(10)));
}
}
diff --cc tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs
index d153740,4bdad4d..393a1eb
--- a/tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs
+++ b/tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs
@@@ -297,8 -291,10 +298,8 @@@ namespace Microsoft.AspNet.SignalR.Test
Name = "David"
};
- var person1 = hub.Invoke<SignalR.Samples.Hubs.DemoHub.DemoHub.Person>("ComplexType", person).Result;
+ var person1 = hub.InvokeWithTimeout<SignalR.Samples.Hubs.DemoHub.DemoHub.Person>("ComplexType", person);
var person2 = hub.GetValue<SignalR.Samples.Hubs.DemoHub.DemoHub.Person>("person");
- JObject obj = ((dynamic)hub).person;
- var person3 = obj.ToObject<SignalR.Samples.Hubs.DemoHub.DemoHub.Person>();
Assert.NotNull(person1);
Assert.NotNull(person2);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.