|
|
|
@ -4,16 +4,19 @@ import pytest
|
|
|
|
|
import requests
|
|
|
|
|
import socket
|
|
|
|
|
import subprocess
|
|
|
|
|
import sys
|
|
|
|
|
import tarfile
|
|
|
|
|
import time
|
|
|
|
|
import urllib3
|
|
|
|
|
|
|
|
|
|
# crudly written to learn more about pytest and to have a base for refactoring
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
ConnectionRefusedError
|
|
|
|
|
|
|
|
|
|
if sys.version_info.major >= 3:
|
|
|
|
|
from pathlib import Path
|
|
|
|
|
connrefused_exc = ConnectionRefusedError
|
|
|
|
|
except NameError:
|
|
|
|
|
else:
|
|
|
|
|
from pathlib2 import Path
|
|
|
|
|
connrefused_exc = socket.error
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -25,7 +28,8 @@ def run_servefile():
|
|
|
|
|
if not isinstance(args, list):
|
|
|
|
|
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))
|
|
|
|
|
instances.append(p)
|
|
|
|
|
|
|
|
|
|