From ccb11979515d3de638f9078e5a6b9d89271648dd Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Mon, 21 Nov 2016 07:30:28 +0100
Subject: [PATCH] Fix tests
---
src/sakia/core/net/node.py | 6 +++---
src/sakia/tests/mocks/server.py | 14 +++++++-------
src/sakia/tests/quamash_utils.py | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/sakia/core/net/node.py b/src/sakia/core/net/node.py
index 44b51959..9ab058ca 100644
--- a/src/sakia/core/net/node.py
+++ b/src/sakia/core/net/node.py
@@ -11,7 +11,7 @@ from ...tools.decorators import asyncify
from duniterpy.api import bma, errors
from duniterpy.api.bma import ConnectionHandler
-from aiohttp.errors import WSClientDisconnectedError, WSServerHandshakeError, ClientResponseError
+from aiohttp.errors import WSServerHandshakeError, ClientResponseError
from aiohttp.errors import ClientError, DisconnectedError
from asyncio import TimeoutError
import logging
@@ -367,7 +367,7 @@ class Node(QObject):
break
elif msg.tp == aiohttp.MsgType.error:
break
- except (WSServerHandshakeError, WSClientDisconnectedError, ClientResponseError, ValueError) as e:
+ except (WSServerHandshakeError, ClientResponseError, ValueError) as e:
logging.debug("Websocket block {0} : {1} - {2}".format(type(e).__name__, str(e), self.pubkey[:5]))
await self.request_current_block()
except (ClientError, gaierror, TimeoutError, DisconnectedError) as e:
@@ -566,7 +566,7 @@ class Node(QObject):
break
elif msg.tp == aiohttp.MsgType.error:
break
- except (WSServerHandshakeError, WSClientDisconnectedError, ClientResponseError, ValueError) as e:
+ except (WSServerHandshakeError, ClientResponseError, ValueError) as e:
logging.debug("Websocket peer {0} : {1} - {2}".format(type(e).__name__, str(e), self.pubkey[:5]))
await self.request_peers()
except (ClientError, gaierror, TimeoutError, DisconnectedError) as e:
diff --git a/src/sakia/tests/mocks/server.py b/src/sakia/tests/mocks/server.py
index 14bb1317..c4945626 100644
--- a/src/sakia/tests/mocks/server.py
+++ b/src/sakia/tests/mocks/server.py
@@ -44,12 +44,7 @@ class MockServer():
self.requests = []
self.app = web.Application(loop=self.lp,
middlewares=[self.middleware_factory])
-
- self.handler = self.app.make_handler(
- keep_alive_on=False,
- access_log=log.access_logger,
- )
-
+ self.handler = None
self.port = self.find_unused_port()
def get_request(self, i):
@@ -90,12 +85,17 @@ class MockServer():
return peer_document_generator(self.port)
async def create_server(self, ssl_ctx=None):
- srv = await self.lp.create_server(self.handler, '127.0.0.1', self.port)
protocol = "https" if ssl_ctx else "http"
url = "{}://127.0.0.1:{}".format(protocol, self.port)
self.add_route('GET', '/network/peering', bma_peering_generator(self.port))
+ self.handler = self.app.make_handler(
+ keep_alive_on=False,
+ access_log=log.access_logger,
+ )
+
+ srv = await self.lp.create_server(self.handler, '127.0.0.1', self.port)
return srv, self.port, url
async def close(self):
diff --git a/src/sakia/tests/quamash_utils.py b/src/sakia/tests/quamash_utils.py
index 7c11293c..591b566d 100644
--- a/src/sakia/tests/quamash_utils.py
+++ b/src/sakia/tests/quamash_utils.py
@@ -10,6 +10,7 @@ class QuamashTest:
def setUpQuamash(self):
self.qapplication = get_application()
self.lp = quamash.QSelectorEventLoop(self.qapplication)
+ self.qapplication.setQuitOnLastWindowClosed(False)
asyncio.set_event_loop(self.lp)
self.lp.set_exception_handler(lambda l, c: unitttest_exception_handler(self, l, c))
self.exceptions = []
--
GitLab