From 0d3b31e6710afe4348eb25f1602f5271c92b9a77 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Tue, 15 Nov 2022 00:39:21 +0000
Subject: Tests: features and options checks improved.

Now version output evaluates only once.
OpenSSL checks more carefully.
---
 test/unit/check/regex.py |  9 ++-------
 test/unit/check/tls.py   | 13 ++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'test/unit/check')

diff --git a/test/unit/check/regex.py b/test/unit/check/regex.py
index 734c0150..51cf966b 100644
--- a/test/unit/check/regex.py
+++ b/test/unit/check/regex.py
@@ -1,13 +1,8 @@
 import re
-import subprocess
 
 
-def check_regex(unitd):
-    output = subprocess.check_output(
-        [unitd, '--version'], stderr=subprocess.STDOUT
-    )
-
-    if re.search('--no-regex', output.decode()):
+def check_regex(output_version):
+    if re.search('--no-regex', output_version):
         return False
 
     return True
diff --git a/test/unit/check/tls.py b/test/unit/check/tls.py
index b878ff7d..53ce5ffc 100644
--- a/test/unit/check/tls.py
+++ b/test/unit/check/tls.py
@@ -2,12 +2,11 @@ import re
 import subprocess
 
 
-def check_openssl(unitd):
-    subprocess.check_output(['which', 'openssl'])
+def check_openssl(output_version):
+    try:
+        subprocess.check_output(['which', 'openssl'])
+    except subprocess.CalledProcessError:
+        return None
 
-    output = subprocess.check_output(
-        [unitd, '--version'], stderr=subprocess.STDOUT
-    )
-
-    if re.search('--openssl', output.decode()):
+    if re.search('--openssl', output_version):
         return True
-- 
cgit 


From 190691ade82f5126271b374dd5b8d0cb57f9473a Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Tue, 29 Nov 2022 01:02:08 +0000
Subject: Tests: NJS.

---
 test/unit/check/njs.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 test/unit/check/njs.py

(limited to 'test/unit/check')

diff --git a/test/unit/check/njs.py b/test/unit/check/njs.py
new file mode 100644
index 00000000..433473a1
--- /dev/null
+++ b/test/unit/check/njs.py
@@ -0,0 +1,6 @@
+import re
+
+
+def check_njs(output_version):
+    if re.search('--njs', output_version):
+        return True
-- 
cgit 


From 648e91a623d3822e8ab4780b452da211ea3ba257 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Mon, 12 Dec 2022 16:24:54 +0000
Subject: Tests: pretty output.

Hide expected alerts by default.
Silence succesfull "go build" information.
---
 test/unit/check/go.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'test/unit/check')

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
-- 
cgit