Tests: features and options checks improved.

Now version output evaluates only once.
OpenSSL checks more carefully.

2 files changed, 8 insertions, 14 deletions

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