From 3498705c826c33562ab6b14ebd44fcc2676775da Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@noa.one>
Date: Mon, 26 Mar 2018 16:29:41 +0200
Subject: [PATCH] Fix master

---
 pseud/heartbeat.py   | 22 +++++++++++-----------
 tests/test_server.py | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pseud/heartbeat.py b/pseud/heartbeat.py
index 0d30688..88fe2de 100644
--- a/pseud/heartbeat.py
+++ b/pseud/heartbeat.py
@@ -33,7 +33,7 @@ class NoOpHeartbeatBackendForClient(_BaseHeartbeatBackend):
     """
     No op Heartbeat
     """
-    name = b'noop_heartbeat_backend'
+    name = 'noop_heartbeat_backend'
 
     async def handle_heartbeat(self, *args):
         pass
@@ -55,9 +55,9 @@ class NoOpHeartbeatBackendForServer(_BaseHeartbeatBackend):
     """
     No op Heartbeat
     """
-    name = b'noop_heartbeat_backend'
+    name = 'noop_heartbeat_backend'
 
-    def handle_timeout(self, *args):
+    async def handle_timeout(self, *args):
         pass
 
     async def handle_heartbeat(self, *args):
@@ -74,9 +74,9 @@ async def stop(self):
 @zope.interface.implementer(IHeartbeatBackend)
 @zope.component.adapter(IClient)
 class TestingHeartbeatBackendForClient(_BaseHeartbeatBackend):
-    name = b'testing_heartbeat_backend'
+    name = 'testing_heartbeat_backend'
 
-    def handle_timeout(self, user_id, routing_id):
+    async def handle_timeout(self, user_id, routing_id):
         pass
 
     async def handle_heartbeat(self, user_id, routing_id):
@@ -94,15 +94,14 @@ async def stop(self):
         self.task.cancel()
         with contextlib.suppress(asyncio.CancelledError):
             await self.task
-        print('STOP done')
 
 
 @register_heartbeat_backend
 @zope.interface.implementer(IHeartbeatBackend)
 @zope.component.adapter(IServer)
 class TestingHeartbeatBackendForServer(_BaseHeartbeatBackend):
-    name = b'testing_heartbeat_backend'
-    max_time_before_dead = .2
+    name = 'testing_heartbeat_backend'
+    timeout = .2
     task_pool = {}
 
     async def handle_timeout(self, user_id, routing_id):
@@ -119,9 +118,10 @@ async def handle_heartbeat(self, user_id, routing_id):
         else:
             task.cancel()
 
-        self.task_pool[user_id] = task = self.rpc.loop.call_later(
-            self.max_time_before_dead,
-            asyncio.ensure_future, self.handle_timeout(user_id, routing_id))
+        self.task_pool[user_id] = self.rpc.loop.call_later(
+            self.timeout,
+            lambda: asyncio.ensure_future(
+                self.handle_timeout(user_id, routing_id)))
 
     def configure(self):
         self.monitoring_socket = self.rpc.context.socket(zmq.PUB)
diff --git a/tests/test_server.py b/tests/test_server.py
index ce9834e..2b4b9ac 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -4,8 +4,9 @@
 import pytest
 import zmq
 
+pytestmark = pytest.mark.asyncio
+
 
-@pytest.mark.asyncio
 async def test_server_creation():
     from pseud import Server
     user_id = b'echo'
@@ -14,22 +15,24 @@ async def test_server_creation():
     assert server.security_plugin == 'noop_auth_backend'
 
 
-def test_server_can_bind():
+async def test_server_can_bind():
     from pseud import Server
     user_id = b'echo'
     endpoint = 'inproc://{}'.format(__name__).encode()
     server = Server(user_id,
                     security_plugin='noop_auth_backend')
     server.bind(endpoint)
+    await server.stop()
 
 
-def test_server_can_connect():
+async def test_server_can_connect():
     from pseud import Server
     user_id = b'echo'
     endpoint = b'tcp://127.0.0.1:5000'
     server = Server(user_id,
                     security_plugin='noop_auth_backend')
     server.connect(endpoint)
+    await server.stop()
 
 
 def make_one_client_socket(endpoint):
@@ -46,7 +49,6 @@ def make_one_server(user_id, endpoint, loop):
     return server
 
 
-@pytest.mark.asyncio
 async def test_job_running(loop):
     from pseud.interfaces import EMPTY_DELIMITER, OK, VERSION, WORK
     from pseud.packer import Packer
@@ -71,7 +73,6 @@ def job_success(a, b, c, d=None):
                             OK, Packer().packb(True)]
 
 
-@pytest.mark.asyncio
 async def test_job_not_found(loop):
     import pseud
     from pseud.interfaces import EMPTY_DELIMITER, ERROR, VERSION, WORK
@@ -93,7 +94,6 @@ async def test_job_not_found(loop):
         assert os.path.dirname(pseud.__file__) in traceback
 
 
-@pytest.mark.asyncio
 async def test_job_raise(loop):
     from pseud.interfaces import ERROR, VERSION, WORK
     from pseud.packer import Packer