seba
/
servefile
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

tests: Use sys.executable during tests

This commit is contained in:
Sebastian Pipping 2020-02-08 00:44:37 +01:00
parent a7d273f13f
commit 0819d23f47
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -14,6 +14,7 @@ setup(
author_email='seba@someserver.de', author_email='seba@someserver.de',
install_requires=['pyopenssl'], install_requires=['pyopenssl'],
tests_require=[ tests_require=[
'pathlib2; python_version<"3"',
'pytest', 'pytest',
'requests', 'requests',
], ],

5
tests/test_servefile.py
View File

@ -13,8 +13,10 @@ import urllib3
if sys.version_info.major >= 3: if sys.version_info.major >= 3:
from pathlib import Path
connrefused_exc = ConnectionRefusedError connrefused_exc = ConnectionRefusedError
else: else:
from pathlib2 import Path
connrefused_exc = socket.error connrefused_exc = socket.error
@ -26,7 +28,8 @@ def run_servefile():
if not isinstance(args, list): if not isinstance(args, list):
args = [args] args = [args]
print("running with args", args) print("running with args", args)
p = subprocess.Popen(['servefile'] + args, **kwargs) servefile_path = str(Path(__file__).parent.parent / 'servefile')
p = subprocess.Popen([sys.executable, servefile_path] + args, **kwargs)
time.sleep(kwargs.get('timeout', 0.3)) time.sleep(kwargs.get('timeout', 0.3))
instances.append(p) instances.append(p)

1
tox.ini
View File

@ -3,6 +3,7 @@ envlist = py27,py36
[testenv] [testenv]
deps = deps =
pathlib2; python_version<"3"
pytest pytest
requests requests
commands = pytest --tb=short {posargs} commands = pytest --tb=short {posargs}