romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-06 19:44:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

pytest: protect test execution of sockd in try block

Browse source
This commit is contained in:
Stefan Eissing 2025-07-21 12:36:39 +02:00
parent 6bc9dbe17f
commit 3239450dc0
No known key found for this signature in database
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -225,6 +225,8 @@ class EnvConfig:
self.caddy = None
self.vsftpd = self.config['vsftpd']['vsftpd']
if self.vsftpd == '':
self.vsftpd = None
self._vsftpd_version = None
if self.vsftpd is not None:
try:
@ -255,23 +257,27 @@ class EnvConfig:
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:
p = subprocess.run(args=[self.sockd, '-v'],
capture_output=True, text=True)
assert p.returncode == 0
if p.returncode != 0:
# not a working vsftpd
try:
p = subprocess.run(args=[self.sockd, '-v'],
capture_output=True, text=True)
assert p.returncode == 0
if p.returncode != 0:
# not a working vsftpd
self.sockd = 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)
else:
self.sockd = None
raise Exception(f'Unable to determine sockd version from: {p.stderr}')
except Exception:
self.sockd = 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)
else:
self.sockd = None
raise Exception(f'Unable to determine sockd version from: {p.stderr}')
self._tcpdump = shutil.which('tcpdump')