Skip to content
Snippets Groups Projects
Commit ccb11979 authored by inso's avatar inso
Browse files

Fix tests

parent 556665f3
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
......@@ -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):
......
......@@ -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 = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment