summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2022-12-12 16:24:54 +0000
committerAndrei Zeliankou <zelenkov@nginx.com>2022-12-12 16:24:54 +0000
commit648e91a623d3822e8ab4780b452da211ea3ba257 (patch)
treee1a91306c321c93844b0411a10ac3bf55e8410af
parentf67a01b88fd7c7057767e18a3dd06c24e94c8aa8 (diff)
downloadunit-648e91a623d3822e8ab4780b452da211ea3ba257.tar.gz
unit-648e91a623d3822e8ab4780b452da211ea3ba257.tar.bz2
Tests: pretty output.
Hide expected alerts by default. Silence succesfull "go build" information.
Diffstat (limited to '')
-rw-r--r--test/conftest.py9
-rw-r--r--test/unit/applications/lang/go.py6
-rw-r--r--test/unit/check/go.py4
3 files changed, 10 insertions, 9 deletions
diff --git a/test/conftest.py b/test/conftest.py
index 759f11bd..c2680744 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -485,14 +485,15 @@ def _check_alerts(*, log=None):
log = f.read()
found = False
-
alerts = re.findall(r'.+\[alert\].+', log)
if alerts:
- print('\nAll alerts/sanitizer errors found in log:')
- [print(alert) for alert in alerts]
found = True
+ if option.detailed:
+ print('\nAll alerts/sanitizer errors found in log:')
+ [print(alert) for alert in alerts]
+
if option.skip_alerts:
for skip in option.skip_alerts:
alerts = [al for al in alerts if re.search(skip, al) is None]
@@ -504,7 +505,7 @@ def _check_alerts(*, log=None):
assert not sanitizer_errors, 'sanitizer error(s)'
- if found:
+ if found and option.detailed:
print('skipped.')
diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 3db955f3..14e76362 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -67,7 +67,9 @@ replace unit.nginx.org/go => {replace_path}
print("\n$ GOPATH=" + env['GOPATH'] + " " + " ".join(args))
try:
- process = subprocess.run(args, env=env, cwd=temp_dir)
+ output = subprocess.check_output(
+ args, env=env, cwd=temp_dir, stderr=subprocess.STDOUT
+ )
except KeyboardInterrupt:
raise
@@ -75,7 +77,7 @@ replace unit.nginx.org/go => {replace_path}
except subprocess.CalledProcessError:
return None
- return process
+ return output
def load(self, script, name='app', **kwargs):
static_build = False
diff --git a/test/unit/check/go.py b/test/unit/check/go.py
index 3d9d13e7..09ae641d 100644
--- a/test/unit/check/go.py
+++ b/test/unit/check/go.py
@@ -2,7 +2,5 @@ from unit.applications.lang.go import TestApplicationGo
def check_go():
- process = TestApplicationGo.prepare_env('empty')
-
- if process != None and process.returncode == 0:
+ if TestApplicationGo.prepare_env('empty') is not None:
return True