forked from seba/servefile
tests: Use sys.executable during tests
This commit is contained in:
parent
a7d273f13f
commit
0819d23f47
1
setup.py
1
setup.py
|
@ -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',
|
||||||
],
|
],
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue