romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 07:03:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

pytest: use dante-server in CI

Browse source 
- add startup check for 'danted' to avoid fails on low cpu
- rename 'sockd' to 'danted' everywhere to clarify what we use
- add proper defaults for 'danted' for debian
- install 'dante-server' in pytest ci runs

Closes #18075
This commit is contained in:
Stefan Eissing 2025-07-29 10:15:43 +02:00 • committed by Daniel Stenberg
parent cd586149d5
commit 6b70e8a838
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
11 changed files with 85 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/http/testenv/dante.py
View file

@ -28,9 +28,12 @@ import logging
import os
import socket
import subprocess
import time
from datetime import timedelta, datetime
from typing import Dict
from . import CurlClient
from .env import Env
from .ports import alloc_ports_and_do
@ -41,12 +44,12 @@ class Dante:
def __init__(self, env: Env):
self.env = env
self._cmd = env.sockd
self._cmd = env.danted
self._port = 0
self.name = 'sockd'
self._port_skey = 'sockd'
self.name = 'danted'
self._port_skey = 'danted'
self._port_specs = {
'sockd': socket.SOCK_STREAM,
'danted': socket.SOCK_STREAM,
}
self._dante_dir = os.path.join(env.gen_dir, self.name)
self._run_dir = os.path.join(self._dante_dir, 'run')
@ -124,7 +127,21 @@ class Dante:
self._process = subprocess.Popen(args=args, stderr=procerr)
if self._process.returncode is not None:
return False
return True
return self.wait_live(timeout=timedelta(seconds=Env.SERVER_TIMEOUT))
def wait_live(self, timeout: timedelta):
curl = CurlClient(env=self.env, run_dir=self._tmp_dir,
timeout=timeout.total_seconds(), socks_args=[
'--socks5', f'127.0.0.1:{self._port}'
])
try_until = datetime.now() + timeout
while datetime.now() < try_until:
r = curl.http_get(url=f'http://{self.env.domain1}:{self.env.http_port}/')
if r.exit_code == 0:
return True
time.sleep(.1)
log.error(f"Server still not responding after {timeout}")
return False
def _rmf(self, path):
if os.path.exists(path):

30
tests/http/testenv/env.py
View file

@ -256,28 +256,28 @@ class EnvConfig:
except Exception:
self.vsftpd = None
self.sockd = self.config['sockd']['sockd']
if self.sockd == '':
self.sockd = None
self._sockd_version = None
if self.sockd is not None:
self.danted = self.config['danted']['danted']
if self.danted == '':
self.danted = None
self._danted_version = None
if self.danted is not None:
try:
p = subprocess.run(args=[self.sockd, '-v'],
p = subprocess.run(args=[self.danted, '-v'],
capture_output=True, text=True)
assert p.returncode == 0
if p.returncode != 0:
# not a working vsftpd
self.sockd = None
self.danted = None
m = re.match(r'^Dante v(\d+\.\d+\.\d+).*', p.stdout)
if not m:
m = re.match(r'^Dante v(\d+\.\d+\.\d+).*', p.stderr)
if m:
self._sockd_version = m.group(1)
self._danted_version = m.group(1)
else:
self.sockd = None
raise Exception(f'Unable to determine sockd version from: {p.stderr}')
self.danted = None
raise Exception(f'Unable to determine danted version from: {p.stderr}')
except Exception:
self.sockd = None
self.danted = None
self._tcpdump = shutil.which('tcpdump')
@ -508,8 +508,8 @@ class Env:
return Env.CONFIG.vsftpd_version
@staticmethod
def has_sockd() -> bool:
return Env.CONFIG.sockd is not None
def has_danted() -> bool:
return Env.CONFIG.danted is not None
@staticmethod
def tcpdump() -> Optional[str]:
@ -673,8 +673,8 @@ class Env:
return self.CONFIG.ports['caddy']
@property
def sockd(self) -> str:
return self.CONFIG.sockd
def danted(self) -> str:
return self.CONFIG.danted
@property
def vsftpd(self) -> str: