arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Do not wait auto start to finish in order to complete project opening

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/2074
This commit is contained in:
Julien Duponchelle 2017-05-22 20:18:07 +02:00
parent 4dc55a5af4
commit 7d30da5d4e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/controller/project.py
View File

@ -675,7 +675,10 @@ class Project:
self._loading = False self._loading = False
# Should we start the nodes when project is open # Should we start the nodes when project is open
if self._auto_start: if self._auto_start:
yield from self.start_all() # Start all in the background without waiting for completion
# we ignore errors because we want to let the user open
# their project and fix it
asyncio.async(self.start_all())
@asyncio.coroutine @asyncio.coroutine
def wait_loaded(self): def wait_loaded(self):

2
tests/utils.py
View File

@ -18,6 +18,7 @@
import io import io
import asyncio import asyncio
import unittest.mock import unittest.mock
import collections.abc
class _asyncio_patch: class _asyncio_patch:
@ -69,6 +70,7 @@ class AsyncioMagicMock(unittest.mock.MagicMock):
""" """
Magic mock returning coroutine Magic mock returning coroutine
""" """
__class__ = collections.abc.Awaitable
def __init__(self, return_value=None, return_values=None, **kwargs): def __init__(self, return_value=None, return_values=None, **kwargs):
""" """