From 99faa982f796f631fe70ae48896dc64126612155 Mon Sep 17 00:00:00 2001
From: Tomáš Chvátal <tchvatal@suse.com>
Date: Jul 19 2019 16:48:33 +0000
Subject: Support for running tests on openSUSE


Adjust $PATH envvar to include SUSE binary location, /usr/lib/mit/sbin,
and provide the LDAP schema location.

Signed-off-by: Tomáš Chvátal <tchvatal@suse.com>
[rharwood@redhat.com: squashed, edited commit message]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Alexander Scheel <ascheel@redhat.com>
Merges: #250

---

diff --git a/tests/runtests.py b/tests/runtests.py
index 9cd546f..b9a2bb6 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -12,7 +12,7 @@ import testlib
 from testlib import *
 
 def check_exec(name):
-    env = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin'}
+    env = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib/mit/sbin'}
     ret = subprocess.call(["which", name], stdout=subprocess.DEVNULL, env=env)
     if ret != 0:
         print(f"Executable '{name}' not found in {env['PATH']}",
diff --git a/tests/testlib.py b/tests/testlib.py
index 05c734d..b722e5f 100755
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -301,6 +301,7 @@ def write_ldap_krb5_config(testdir):
 
     k5schema = None
     for path in ["/usr/share/doc/krb5-server-ldap*/kerberos.schema",
+                 "/usr/share/kerberos/ldap/kerberos.schema",
                  "/usr/share/doc/krb5-kdc-ldap/kerberos.schema.gz"]:
         pathlist = glob.glob(path)
         if len(pathlist) > 0:
@@ -367,7 +368,7 @@ def setup_ldap(testdir, wrapenv):
     stashfile = os.path.join(testdir, "ldap_passwd")
     krb5conf = os.path.join(testdir, 'krb5.conf')
 
-    ldapenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin',
+    ldapenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib/mit/sbin',
                'KRB5_CONFIG': krb5conf}
     ldapenv.update(wrapenv)
 
@@ -411,7 +412,7 @@ def setup_kdc(testdir, wrapenv):
     kdcstash = os.path.join(kdcdir, KDC_STASH)
     kdcdb = os.path.join(kdcdir, KDC_DBNAME)
 
-    kdcenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin',
+    kdcenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib/mit/sbin',
               'KRB5_CONFIG': krb5conf,
               'KRB5_KDC_PROFILE': kdcconf}
     kdcenv.update(wrapenv)