technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: fixed incorrect "--restart" mode performing.

Browse Source
This commit is contained in:
Andrei Zeliankou
2021-05-17 15:39:15 +01:00
parent c216f26d30
commit 1198118b3b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/conftest.py
View File

@@ -355,7 +355,9 @@ def run(request):
fds_diff = waitforfds(lambda: _count_fds(ps['pid']) - ps['fds']) fds_diff = waitforfds(lambda: _count_fds(ps['pid']) - ps['fds'])
ps['fds'] += fds_diff ps['fds'] += fds_diff
assert ps['pid'] == ps_pid, 'same pid %s' % name if not option.restart:
assert ps['pid'] == ps_pid, 'same pid %s' % name
assert fds_diff <= option.fds_threshold, ( assert fds_diff <= option.fds_threshold, (
'descriptors leak %s' % name 'descriptors leak %s' % name
) )
@@ -573,7 +575,7 @@ def _count_fds(pid):
).decode() ).decode()
return len(out.splitlines()) return len(out.splitlines())
except (FileNotFoundError, subprocess.CalledProcessError): except (FileNotFoundError, TypeError, subprocess.CalledProcessError):
pass pass
try: try:
@@ -582,7 +584,7 @@ def _count_fds(pid):
).decode() ).decode()
return len(out.splitlines()) return len(out.splitlines())
except (FileNotFoundError, subprocess.CalledProcessError): except (FileNotFoundError, TypeError, subprocess.CalledProcessError):
pass pass
return 0 return 0
@@ -675,6 +677,6 @@ def pytest_sessionfinish(session):
public_dir(option.cache_dir) public_dir(option.cache_dir)
shutil.rmtree(option.cache_dir) shutil.rmtree(option.cache_dir)
if not option.save_log: if not option.save_log and os.path.isdir(option.temp_dir):
public_dir(option.temp_dir) public_dir(option.temp_dir)
shutil.rmtree(option.temp_dir) shutil.rmtree(option.temp_dir)