summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-06-30 14:58:21 +1200
committerAndrew Bartlett <abartlet@samba.org>2014-07-04 02:52:35 +0200
commit5d069a04fc843512b6a703691d81c4c1d28ef744 (patch)
treebbbe4d92a9eedd762b859d68b1989206005d558b
parent95a55df021b3f112a18c64a5f5897182ae8b7df8 (diff)
downloadsamba-5d069a04fc843512b6a703691d81c4c1d28ef744.tar.gz
selftest: Make the wbinfo userinfo tests work properly with the qualified name
This eliminates a knownfail. Change-Id: I7331a4e62ef8c1f2a9999a78865023ae19beeaca Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
-rw-r--r--selftest/knownfail2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 753442e02d7..48abca08f3e 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -276,8 +276,6 @@
#
# These do not work against winbindd in member mode for unknown reasons
#
-^samba.wbinfo_simple.\(member:local\).--user-info
-^samba.wbinfo_simple.\(s3member:local\).--user-info
^samba4.winbind.struct.getpwent\(plugin_s4_dc: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 698ee2cb3e0..ce728f93a30 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -398,7 +398,7 @@ for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]:
"--domain-groups",
"--name-to-sid=$DC_USERNAME",
"--name-to-sid=$DOMAIN/$DC_USERNAME",
- "--user-info=$DC_USERNAME",
+ "--user-info=$DOMAIN/$DC_USERNAME",
"--user-groups=$DOMAIN/$DC_USERNAME",
"--authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD",
"--allocate-uid",