mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-28 03:08:14 +00:00
Final fixes for windows test suite
This commit is contained in:
parent
3f26ada081
commit
e7ae1776f4
@ -202,8 +202,8 @@ def test_get_startup_script_using_default_script(vm):
|
|||||||
vm._script_file = None
|
vm._script_file = None
|
||||||
|
|
||||||
filepath = os.path.join(vm.working_dir, 'startup.vpc')
|
filepath = os.path.join(vm.working_dir, 'startup.vpc')
|
||||||
with open(filepath, 'w+') as f:
|
with open(filepath, 'wb+') as f:
|
||||||
assert f.write(content)
|
assert f.write(content.encode("utf-8"))
|
||||||
|
|
||||||
assert vm.startup_script == content
|
assert vm.startup_script == content
|
||||||
assert vm.script_file == filepath
|
assert vm.script_file == filepath
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import pytest
|
import pytest
|
||||||
|
import sys
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
from gns3server.utils.asyncio import wait_run_in_executor, subprocess_check_output, wait_for_process_termination
|
from gns3server.utils.asyncio import wait_run_in_executor, subprocess_check_output, wait_for_process_termination
|
||||||
@ -43,6 +44,7 @@ def test_exception_wait_run_in_executor(loop):
|
|||||||
result = loop.run_until_complete(asyncio.async(exec))
|
result = loop.run_until_complete(asyncio.async(exec))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
|
||||||
def test_subprocess_check_output(loop, tmpdir, restore_original_path):
|
def test_subprocess_check_output(loop, tmpdir, restore_original_path):
|
||||||
|
|
||||||
path = str(tmpdir / "test")
|
path = str(tmpdir / "test")
|
||||||
|
Loading…
Reference in New Issue
Block a user