summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-02-07 12:16:30 +0100
committerGünther Deschner <gd@samba.org>2015-02-13 18:25:41 +0100
commitfd783b04bb82feed75c41c6d96506dbe691d97f2 (patch)
tree18f9ac03c4b8b6adabc89c91bd3e87a2fd1645ab
parent6cab59e0162b6d8f274f25a59e5105ff40a84c83 (diff)
downloadsamba-fd783b04bb82feed75c41c6d96506dbe691d97f2.tar.gz
samba-fd783b04bb82feed75c41c6d96506dbe691d97f2.tar.xz
samba-fd783b04bb82feed75c41c6d96506dbe691d97f2.zip
selftest: run the samba.nss tests against :local environments
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org>
-rw-r--r--selftest/knownfail2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index a38fe9f714..b694d06723 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -271,7 +271,7 @@
^samba.blackbox.wbinfo\(s4member:local\).wbinfo --user-sids against s4member\(s4member:local\)
^samba4.winbind.struct.getpwent\(plugin_s4_dc:local\)
^samba.wbinfo_simple.\(s4member:local\).--user-groups
-^samba.nss.test using winbind\(s4member\)
+^samba.nss.test using winbind\(s4member:local\)
#
# These just happen to fail for some reason (probably because they run against the s4 winbind)
#
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 00146b84cb..60860389f2 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -419,7 +419,7 @@ for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]:
nsstest4 = binpath("nsstest")
-for env in ["plugin_s4_dc", "dc", "s4member", "s3dc", "s3member", "member"]:
+for env in ["plugin_s4_dc:local", "dc:local", "s4member:local", "s3dc:local", "s3member:local", "member:local"]:
if os.path.exists(nsstest4):
plantestsuite("samba.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "shared/libnss_wrapper_winbind.so.2")])
else: