From a9ad0e6b8557f101f2b4eb6266910fe1ec102332 Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Sat, 19 Oct 2013 22:40:55 -0700 Subject: [PATCH] Make test simpler --- test/test_capability.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/test_capability.py b/test/test_capability.py index cdad541..e08fb31 100644 --- a/test/test_capability.py +++ b/test/test_capability.py @@ -16,13 +16,10 @@ class Server: context.results.x = str(context.params.i * 5 + self.val) class PipelineServer: - def __init__(self, capability): - self.capability = capability - def getCap(self, context): def _then(response): context.results.s = response.x + '_foo' - context.results.outBox.cap = self.capability.TestInterface.new_server(Server(100)) + context.results.outBox.cap = capability().TestInterface.new_server(Server(100)) return context.params.inCap.foo(i=context.params.n).then(_then) @@ -88,7 +85,7 @@ def test_simple_client(capability): def test_pipeline(capability): loop = capnp.EventLoop() - client = capability.TestPipeline.new_client(PipelineServer(capability), loop) + client = capability.TestPipeline.new_client(PipelineServer(), loop) foo_client = capability.TestInterface.new_client(Server(), loop) remote = client.getCap(n=5, inCap=foo_client) @@ -101,7 +98,3 @@ def test_pipeline(capability): response = loop.wait_remote(remote) assert response.s == '26_foo' - - - -