Deleted
Added
conftest.py (1805:55de51d00bca) | conftest.py (1807:858dbd8c0894) |
---|---|
1import fcntl 2import inspect 3import json 4import os 5import platform 6import re 7import shutil 8import signal --- 5 unchanged lines hidden (view full) --- 14import time 15from multiprocessing import Process 16 17import pytest 18from unit.check.go import check_go 19from unit.check.isolation import check_isolation 20from unit.check.node import check_node 21from unit.check.tls import check_openssl | 1import fcntl 2import inspect 3import json 4import os 5import platform 6import re 7import shutil 8import signal --- 5 unchanged lines hidden (view full) --- 14import time 15from multiprocessing import Process 16 17import pytest 18from unit.check.go import check_go 19from unit.check.isolation import check_isolation 20from unit.check.node import check_node 21from unit.check.tls import check_openssl |
22from unit.check.regex import check_regex |
|
22from unit.http import TestHTTP 23from unit.option import option 24from unit.utils import public_dir 25from unit.utils import waitforfiles 26 27 28def pytest_addoption(parser): 29 parser.addoption( --- 141 unchanged lines hidden (view full) --- 171 172 # discover modules from check 173 174 option.available['modules']['openssl'] = check_openssl(unit['unitd']) 175 option.available['modules']['go'] = check_go( 176 option.current_dir, unit['temp_dir'], option.test_dir 177 ) 178 option.available['modules']['node'] = check_node(option.current_dir) | 23from unit.http import TestHTTP 24from unit.option import option 25from unit.utils import public_dir 26from unit.utils import waitforfiles 27 28 29def pytest_addoption(parser): 30 parser.addoption( --- 141 unchanged lines hidden (view full) --- 172 173 # discover modules from check 174 175 option.available['modules']['openssl'] = check_openssl(unit['unitd']) 176 option.available['modules']['go'] = check_go( 177 option.current_dir, unit['temp_dir'], option.test_dir 178 ) 179 option.available['modules']['node'] = check_node(option.current_dir) |
180 option.available['modules']['regex'] = check_regex(unit['unitd']) |
|
179 180 # remove None values 181 182 option.available['modules'] = { 183 k: v for k, v in option.available['modules'].items() if v is not None 184 } 185 186 check_isolation() --- 360 unchanged lines hidden --- | 181 182 # remove None values 183 184 option.available['modules'] = { 185 k: v for k, v in option.available['modules'].items() if v is not None 186 } 187 188 check_isolation() --- 360 unchanged lines hidden --- |