IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force server methods to be async and client calls to use await

Browse Source
This commit is contained in:
Lasse Blaauwbroek
2023-06-08 03:56:57 +02:00
parent a69bc72a0b
commit 4b5c4211f1
11 changed files with 193 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
test/test_capability_old.py
View File

@@ -17,13 +17,13 @@ class Server:
def __init__(self, val=1):
self.val = val
def foo(self, i, j, **kwargs):
async def foo(self, i, j, **kwargs):
extra = 0
if j:
extra = 1
return str(i * 5 + extra + self.val)
def buz(self, i, **kwargs):
async def buz(self, i, **kwargs):
return i.host + "_test"
@@ -31,13 +31,11 @@ class PipelineServer:
def __init__(self, capability):
self.capability = capability
def getCap(self, n, inCap, _context, **kwargs):
def _then(response):
_results = _context.results
_results.s = response.x + "_foo"
_results.outBox.cap = self.capability.TestInterface._new_server(Server(100))
return inCap.foo(i=n).then(_then)
async def getCap(self, n, inCap, _context, **kwargs):
response = await inCap.foo(i=n)
_results = _context.results
_results.s = response.x + "_foo"
_results.outBox.cap = self.capability.TestInterface._new_server(Server(100))
async def test_client(capability):
@@ -47,7 +45,7 @@ async def test_client(capability):
req.i = 5
remote = req.send()
response = remote.wait()
response = await remote
assert response.x == "26"
@@ -55,7 +53,7 @@ async def test_client(capability):
req.i = 5
remote = req.send()
response = remote.wait()
response = await remote
assert response.x == "26"
@@ -77,37 +75,37 @@ async def test_simple_client(capability):
client = capability.TestInterface._new_client(Server())
remote = client._send("foo", i=5)
response = remote.wait()
response = await remote
assert response.x == "26"
remote = client.foo(i=5)
response = remote.wait()
response = await remote
assert response.x == "26"
remote = client.foo(i=5, j=True)
response = remote.wait()
response = await remote
assert response.x == "27"
remote = client.foo(5)
response = remote.wait()
response = await remote
assert response.x == "26"
remote = client.foo(5, True)
response = remote.wait()
response = await remote
assert response.x == "27"
remote = client.foo(5, j=True)
response = remote.wait()
response = await remote
assert response.x == "27"
remote = client.buz(capability.TestSturdyRefHostId.new_message(host="localhost"))
response = remote.wait()
response = await remote
assert response.x == "localhost_test"
@@ -136,10 +134,10 @@ async def test_pipeline(capability):
outCap = remote.outBox.cap
pipelinePromise = outCap.foo(i=10)
response = pipelinePromise.wait()
response = await pipelinePromise
assert response.x == "150"
response = remote.wait()
response = await remote
assert response.s == "26_foo"
@@ -147,7 +145,7 @@ class BadServer:
def __init__(self, val=1):
self.val = val
def foo(self, i, j, **kwargs):
async def foo(self, i, j, **kwargs):
extra = 0
if j:
extra = 1
@@ -159,24 +157,19 @@ async def test_exception_client(capability):
remote = client._send("foo", i=5)
with pytest.raises(capnp.KjException):
remote.wait()
await remote
class BadPipelineServer:
def __init__(self, capability):
self.capability = capability
def getCap(self, n, inCap, _context, **kwargs):
def _then(response):
_results = _context.results
_results.s = response.x + "_foo"
_results.outBox.cap = self.capability.TestInterface._new_server(Server(100))
def _error(error):
async def getCap(self, n, inCap, _context, **kwargs):
try:
await inCap.foo(i=n)
except capnp.KjException:
raise Exception("test was a success")
return inCap.foo(i=n).then(_then, _error)
async def test_exception_chain(capability):
client = capability.TestPipeline._new_client(BadPipelineServer(capability))
@@ -185,7 +178,7 @@ async def test_exception_chain(capability):
remote = client.getCap(n=5, inCap=foo_client)
try:
remote.wait()
await remote
except Exception as e:
assert "test was a success" in str(e)
@@ -200,10 +193,10 @@ async def test_pipeline_exception(capability):
pipelinePromise = outCap.foo(i=10)
with pytest.raises(Exception):
pipelinePromise.wait()
await pipelinePromise
with pytest.raises(Exception):
remote.wait()
await remote
async def test_casting(capability):
@@ -219,7 +212,7 @@ class TailCallOrder:
def __init__(self):
self.count = -1
def getCallSequence(self, expected, **kwargs):
async def getCallSequence(self, expected, **kwargs):
self.count += 1
return self.count
@@ -228,11 +221,11 @@ class TailCaller:
def __init__(self):
self.count = 0
def foo(self, i, callee, _context, **kwargs):
async def foo(self, i, callee, _context, **kwargs):
self.count += 1
tail = callee.foo_request(i=i, t="from TailCaller")
return _context.tail_call(tail)
await _context.tail_call(tail)
class TailCallee:
@@ -240,7 +233,7 @@ class TailCallee:
self.count = 0
self.capability = capability
def foo(self, i, t, _context, **kwargs):
async def foo(self, i, t, _context, **kwargs):
self.count += 1
results = _context.results
@@ -259,7 +252,7 @@ async def test_tail_call(capability):
promise = caller.foo(i=456, callee=callee)
dependent_call1 = promise.c.getCallSequence()
response = promise.wait()
response = await promise
assert response.i == 456
assert response.i == 456
@@ -267,11 +260,11 @@ async def test_tail_call(capability):
dependent_call2 = response.c.getCallSequence()
dependent_call3 = response.c.getCallSequence()
result = dependent_call1.wait()
result = await dependent_call1
assert result.n == 0
result = dependent_call2.wait()
result = await dependent_call2
assert result.n == 1
result = dependent_call3.wait()
result = await dependent_call3
assert result.n == 2
assert callee_server.count == 1