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

Tests: initialising log params before first _print_log().

Browse Source
This commit is contained in:
Max Romanov
2021-08-11 19:01:16 +03:00
parent 5f67d30ec7
commit 9988569bea
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/conftest.py
View File

@@ -400,6 +400,8 @@ def unit_run():
with open(temp_dir + '/unit.log', 'w') as log: with open(temp_dir + '/unit.log', 'w') as log:
unit_instance['process'] = subprocess.Popen(unitd_args, stderr=log) unit_instance['process'] = subprocess.Popen(unitd_args, stderr=log)
Log.temp_dir = temp_dir
if not waitforfiles(temp_dir + '/control.unit.sock'): if not waitforfiles(temp_dir + '/control.unit.sock'):
_print_log() _print_log()
exit('Could not start unit') exit('Could not start unit')
@@ -409,7 +411,6 @@ def unit_run():
unit_instance['unitd'] = unitd unit_instance['unitd'] = unitd
option.temp_dir = temp_dir option.temp_dir = temp_dir
Log.temp_dir = temp_dir
with open(temp_dir + '/unit.pid', 'r') as f: with open(temp_dir + '/unit.pid', 'r') as f:
unit_instance['pid'] = f.read().rstrip() unit_instance['pid'] = f.read().rstrip()
@@ -487,7 +488,7 @@ def _check_alerts(*, log=None):
print('skipped.') print('skipped.')
def _print_log(log): def _print_log(log=None):
path = Log.get_path() path = Log.get_path()
print('Path to unit.log:\n' + path + '\n') print('Path to unit.log:\n' + path + '\n')