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

Tests: features and options checks improved.

Browse Source 
Now version output evaluates only once.
OpenSSL checks more carefully.
This commit is contained in:
Andrei Zeliankou
2022-11-15 00:39:21 +00:00
parent 40d75c94a0
commit 0d3b31e671
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/conftest.py
View File

@@ -176,6 +176,9 @@ def pytest_sessionstart(session):
option.available = {'modules': {}, 'features': {}}
unit = unit_run()
output_version = subprocess.check_output(
[unit['unitd'], '--version'], stderr=subprocess.STDOUT
).decode()
# read unit.log
@@ -202,10 +205,10 @@ def pytest_sessionstart(session):
# discover modules from check
option.available['modules']['openssl'] = check_openssl(unit['unitd'])
option.available['modules']['go'] = check_go()
option.available['modules']['node'] = check_node(option.current_dir)
option.available['modules']['regex'] = check_regex(unit['unitd'])
option.available['modules']['openssl'] = check_openssl(output_version)
option.available['modules']['regex'] = check_regex(output_version)
# remove None values