diff options
| author | Andrei Zeliankou <zelenkov@nginx.com> | 2022-11-15 00:39:21 +0000 |
|---|---|---|
| committer | Andrei Zeliankou <zelenkov@nginx.com> | 2022-11-15 00:39:21 +0000 |
| commit | 0d3b31e6710afe4348eb25f1602f5271c92b9a77 (patch) | |
| tree | 6383fcfa881635a62a2713c2c3b3a98d95a23153 /test/conftest.py | |
| parent | 40d75c94a039f35505975736bb4f907ec456c9bd (diff) | |
| download | unit-0d3b31e6710afe4348eb25f1602f5271c92b9a77.tar.gz unit-0d3b31e6710afe4348eb25f1602f5271c92b9a77.tar.bz2 | |
Tests: features and options checks improved.
Now version output evaluates only once.
OpenSSL checks more carefully.
Diffstat (limited to 'test/conftest.py')
| -rw-r--r-- | test/conftest.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/conftest.py b/test/conftest.py index 18851baa..ac88675a 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -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 |