python/samba/tests: don't use hardcoded names in *pam_winbind* tests

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/tests/pam_winbind.py b/python/samba/tests/pam_winbind.py
index 21ea2fbed7ec5b734c3e297a92bc71be6e463346..1054e86dc9d45e90e7b79387bfeaecb413199a12 100644 (file)
--- a/python/samba/tests/pam_winbind.py
+++ b/python/samba/tests/pam_winbind.py
@@ -18,22 +18,29 @@
 
 import samba.tests
 import pypamtest
+import os
 
 class SimplePamTests(samba.tests.TestCase):
     def test_authenticate(self):
-        alice_password = "Secret007"
+        domain = os.environ["DOMAIN"]
+        username = os.environ["USERNAME"]
+        password = os.environ["PASSWORD"]
+        unix_username = "%s/%s" % (domain, username)
         expected_rc = 0 # PAM_SUCCESS
 
         tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc)
-        res = pypamtest.run_pamtest("SAMBADOMAIN/alice", "samba", [tc], [alice_password])
+        res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password])
 
         self.assertTrue(res != None)
 
     def test_authenticate_error(self):
-        alice_password = "WrongPassword"
+        domain = os.environ["DOMAIN"]
+        username = os.environ["USERNAME"]
+        password = "WrongPassword"
+        unix_username = "%s/%s" % (domain, username)
         expected_rc = 7 # PAM_AUTH_ERR
 
         tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc)
-        res = pypamtest.run_pamtest("SAMBADOMAIN/alice", "samba", [tc], [alice_password])
+        res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password])
 
         self.assertTrue(res != None)

diff --git a/python/samba/tests/test_pam_winbind.sh b/python/samba/tests/test_pam_winbind.sh
index bf59296b7327d936bfdad28faa397e8abae29547..fdd2870dff40a814eba7d07523e263bf18999c81 100755 (executable)
--- a/python/samba/tests/test_pam_winbind.sh
+++ b/python/samba/tests/test_pam_winbind.sh
@@ -4,6 +4,14 @@ PYTHON="$1"
 PAM_WRAPPER_SO_PATH="$2"
 shift 2
 
+DOMAIN="$1"
+export DOMAIN
+USERNAME="$2"
+export USERNAME
+PASSWORD="$3"
+export PASSWORD
+shift 3
+
 PAM_WRAPPER_PATH="$BINDIR/default/lib/pam_wrapper"
 
 pam_winbind="$BINDIR/shared/pam_winbind.so"

diff --git a/selftest/tests.py b/selftest/tests.py
index 5367fe35936a1de36aa61f4272d5ea3eea1d048f..9033dd9a9a0c21672276633dad95b507d842ff7a 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -140,7 +140,8 @@ planpythontestsuite("none", "samba.tests.glue", py3_compatible=True)
 
 if with_pam:
     plantestsuite("samba.tests.pam_winbind", "ad_member",
-                  [os.path.join(srcdir(), "python/samba/tests/test_pam_winbind.sh"), valgrindify(python), pam_wrapper_so_path])
+                  [os.path.join(srcdir(), "python/samba/tests/test_pam_winbind.sh"),
+                   valgrindify(python), pam_wrapper_so_path, "$DOMAIN", "alice", "Secret007"])
 
 if with_cmocka:
     plantestsuite("samba.unittests.krb5samba", "none",