FabInfra-Mirror/libs.capnproto-dotnetcore_Runtime
1
0
Fork 0
mirror of https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git synced 2025-03-12 14:51:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Test stability improvements

Browse Source
This commit is contained in:
Christian Köllner 2019-08-19 22:46:58 +02:00
parent b2e946d18f
commit 4a261e2c58
4 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
View File

@ -349,7 +349,7 @@ namespace Capnp.Net.Runtime.Tests
{ {
AssertOutput(stdout, "ReleaseOnCancel test start"); AssertOutput(stdout, "ReleaseOnCancel test start");
AssertOutput(stdout, "ReleaseOnCancel test end"); AssertOutput(stdout, "ReleaseOnCancel test end");
Assert.IsTrue(SpinWait.SpinUntil(() => counters.HandleCount == 0, MediumNonDbgTimeout)); Assert.IsTrue(SpinWait.SpinUntil(() => counters.HandleCount == 0, MediumNonDbgTimeout), $"Handle count stuck at {counters.HandleCount}");
}); });
} }
} }
@ -773,42 +773,44 @@ namespace Capnp.Net.Runtime.Tests
} }
var cap = new TestCallOrderImpl(); var cap = new TestCallOrderImpl();
using (Skeleton.Claim(cap))
var earlyCall = main.GetCallSequence(0, default);
var echo = main.Echo(cap, default);
using (var pipeline = echo.Eager())
{ {
var call0 = pipeline.GetCallSequence(0, default); var earlyCall = main.GetCallSequence(0, default);
var call1 = pipeline.GetCallSequence(1, default);
Assert.IsTrue(earlyCall.Wait(MediumNonDbgTimeout), "early call returns"); var echo = main.Echo(cap, default);
var call2 = pipeline.GetCallSequence(2, default); using (var pipeline = echo.Eager())
Assert.IsTrue(echo.Wait(MediumNonDbgTimeout));
using (var resolved = echo.Result)
{ {
var call3 = pipeline.GetCallSequence(3, default); var call0 = pipeline.GetCallSequence(0, default);
var call4 = pipeline.GetCallSequence(4, default); var call1 = pipeline.GetCallSequence(1, default);
var call5 = pipeline.GetCallSequence(5, default);
Assert.IsTrue(call0.Wait(MediumNonDbgTimeout), "call 0 returns"); Assert.IsTrue(earlyCall.Wait(MediumNonDbgTimeout), "early call returns");
Assert.IsTrue(call1.Wait(MediumNonDbgTimeout), "call 1 returns");
Assert.IsTrue(call2.Wait(MediumNonDbgTimeout), "call 2 returns"); var call2 = pipeline.GetCallSequence(2, default);
Assert.IsTrue(call3.Wait(MediumNonDbgTimeout), "call 3 returns");
Assert.IsTrue(call4.Wait(MediumNonDbgTimeout), "call 4 returns"); Assert.IsTrue(echo.Wait(MediumNonDbgTimeout));
Assert.IsTrue(call5.Wait(MediumNonDbgTimeout), "call 5 returns"); using (var resolved = echo.Result)
{
var call3 = pipeline.GetCallSequence(3, default);
var call4 = pipeline.GetCallSequence(4, default);
var call5 = pipeline.GetCallSequence(5, default);
Assert.IsTrue(call0.Wait(MediumNonDbgTimeout), "call 0 returns");
Assert.IsTrue(call1.Wait(MediumNonDbgTimeout), "call 1 returns");
Assert.IsTrue(call2.Wait(MediumNonDbgTimeout), "call 2 returns");
Assert.IsTrue(call3.Wait(MediumNonDbgTimeout), "call 3 returns");
Assert.IsTrue(call4.Wait(MediumNonDbgTimeout), "call 4 returns");
Assert.IsTrue(call5.Wait(MediumNonDbgTimeout), "call 5 returns");
Assert.AreEqual(0u, call0.Result);
Assert.AreEqual(1u, call1.Result);
Assert.AreEqual(2u, call2.Result);
Assert.AreEqual(3u, call3.Result);
Assert.AreEqual(4u, call4.Result);
Assert.AreEqual(5u, call5.Result);
}
Assert.AreEqual(0u, call0.Result);
Assert.AreEqual(1u, call1.Result);
Assert.AreEqual(2u, call2.Result);
Assert.AreEqual(3u, call3.Result);
Assert.AreEqual(4u, call4.Result);
Assert.AreEqual(5u, call5.Result);
} }
} }
} }
} }

11
Capnp.Net.Runtime/Rpc/Impatient.cs
View File

@ -30,7 +30,18 @@ namespace Capnp.Rpc
} }
var rtask = AwaitAnswer(); var rtask = AwaitAnswer();
// Really weird: We'd expect AwaitAnswer() to initialize a new Task instance upon each invocation.
// However, this does not seem to be always true (as indicated by CI test suite). An explanation might be
// that the underlying implementation recycles Task instances. Let's work around it.
#if NETSTANDARD2_0
_taskTable.Remove(rtask);
_taskTable.Add(rtask, promise); _taskTable.Add(rtask, promise);
#else
_taskTable.AddOrUpdate(rtask, promise);
#endif
return rtask; return rtask;
} }

8
CapnpCompatTest/CapnpCompatTest.cpp
View File

@ -821,9 +821,11 @@ void ReleaseOnCancelTest(capnp::EzRpcClient& rpc)
// //
// TODO(cleanup): This is fragile, but I'm not sure how else to write it without a ton // TODO(cleanup): This is fragile, but I'm not sure how else to write it without a ton
// of scaffolding. // of scaffolding.
kj::evalLater([]() {}).wait(waitScope); //kj::evalLater([]() {}).wait(waitScope);
kj::evalLater([]() {}).wait(waitScope); //kj::evalLater([]() {}).wait(waitScope);
waitScope.poll(); //waitScope.poll();
promise.wait(waitScope);
} }
for (uint i = 0; i < 16; i++) kj::evalLater([]() {}).wait(waitScope); for (uint i = 0; i < 16; i++) kj::evalLater([]() {}).wait(waitScope);

6
appveyor.yml
View File

@ -48,4 +48,8 @@ test_script:
- cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Release\netcoreapp2.2\Capnp.Net.Runtime.Tests.Core21.dll - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Release\netcoreapp2.2\Capnp.Net.Runtime.Tests.Core21.dll
on_finish : on_finish :
# any cleanup in here # any cleanup in here
deploy: off deploy:
- provider: Environment
name: GitHub
on:
APPVEYOR_REPO_TAG: true