arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-03-03 17:56:05 +00:00
Code Issues Releases Wiki Activity

Avoid tasks lost during tests creating noisy warnings

Browse Source
This commit is contained in:
Julien Duponchelle 2016-09-02 14:09:01 +02:00
parent 2d86a7fdcf
commit 0afd7b78b7
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/compute.py
View File

@ -377,7 +377,7 @@ class Compute:
try: try:
self._ws = yield from self._session().ws_connect(self._getUrl("/notifications/ws"), auth=self._auth) self._ws = yield from self._session().ws_connect(self._getUrl("/notifications/ws"), auth=self._auth)
except aiohttp.errors.WSServerHandshakeError: except aiohttp.errors.WSServerHandshakeError:
self._ws self._ws = None
while self._ws is not None: while self._ws is not None:
try: try:
response = yield from self._ws.receive() response = yield from self._ws.receive()

33
tests/conftest.py
View File

@ -55,17 +55,14 @@ def restore_original_path():
os.environ["PATH"] = tempfile.mkdtemp() os.environ["PATH"] = tempfile.mkdtemp()
@pytest.fixture(scope="session") @pytest.yield_fixture(scope="session")
def loop(request): def loop(request):
"""Return an event loop and destroy it at the end of test""" """Return an event loop and destroy it at the end of test"""
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) # Replace main loop to avoid conflict between tests asyncio.set_event_loop(loop) # Replace main loop to avoid conflict between tests
yield loop
def tear_down(): #loop.close()
loop.close() asyncio.set_event_loop(None)
asyncio.set_event_loop(None)
request.addfinalizer(tear_down)
return loop
def _get_unused_port(): def _get_unused_port():
@ -78,8 +75,8 @@ def _get_unused_port():
return port return port
@pytest.fixture @pytest.yield_fixture
def http_server(request, loop, port_manager, monkeypatch): def http_server(request, loop, port_manager, monkeypatch, controller):
"""A GNS3 server""" """A GNS3 server"""
app = web.Application() app = web.Application()
@ -102,15 +99,15 @@ def http_server(request, loop, port_manager, monkeypatch):
else: else:
break break
def tear_down(): yield (host, port)
for module in MODULES:
instance = module.instance() loop.run_until_complete(controller.stop())
monkeypatch.setattr('gns3server.compute.virtualbox.virtualbox_vm.VirtualBoxVM.close', lambda self: True) for module in MODULES:
loop.run_until_complete(instance.unload()) instance = module.instance()
srv.close() monkeypatch.setattr('gns3server.compute.virtualbox.virtualbox_vm.VirtualBoxVM.close', lambda self: True)
srv.wait_closed() loop.run_until_complete(instance.unload())
request.addfinalizer(tear_down) srv.close()
return (host, port) srv.wait_closed()
@pytest.fixture @pytest.fixture