branch master updated: Check for test-relevant executables early in suite

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

rharwood pushed a commit to branch master
in repository gssproxy.

The following commit(s) were added to refs/heads/master by this push:
     new f59040a  Check for test-relevant executables early in suite
f59040a is described below

commit f59040ab4e98b11ef0d6bcbb27ba3015e6550f00
Author: Robbie Harwood 
AuthorDate: Mon Oct 1 17:37:22 2018 -0400

Check for test-relevant executables early in suite

This prevents, for instance, mysterious failures when valgrind isn't
    installed.

Signed-off-by: Robbie Harwood 
    Reviewed-by: Simo Sorce 
    Resolves: #228
    Merges: #234
---
 tests/runtests.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/runtests.py b/tests/runtests.py
index 7af24cf..4150543 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -4,12 +4,21 @@
 import argparse
 import importlib
 import signal
+import subprocess
 import sys
 import traceback

import testlib
 from testlib import *

+def check_exec(name):
+    env = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin'}
+    ret = subprocess.call(["which", name], stdout=subprocess.DEVNULL, env=env)
+    if ret != 0:
+        print(f"Executable '{name}' not found in {env['PATH']}",
+              file=sys.stderr)
+        exit(1)
+
 def parse_args():
     parser = argparse.ArgumentParser(description='GSS-Proxy Tests Environment')
     parser.add_argument('--path', default='%s/testdir' % os.getcwd(),
@@ -40,6 +49,11 @@ def parse_args():
 def runtests_main(testfiles):
     args = parse_args()

+    for e in ["bash", "pkg-config", "zcat", "kinit", "krb5kdc", "kdb5_util",
+             "kadmin.local", "kdb5_ldap_util", "slapd", "slapadd",
+              "ldapmodify", "valgrind"]:
+        check_exec(e)
+
     testdir = args['path']
     if os.path.exists(testdir):
         shutil.rmtree(testdir)