summaryrefslogtreecommitdiffstats
path: root/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-03-31 20:47:18 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-06-04 03:22:25 +0200
commit2b558f2096410b1afd2a6d5bde2862b4cc4fd587 (patch)
treeef9aa7154181d1150e89a79c9481173e8c6fe293 /selftest
parentb2c0a6a8510a55899a20ff923ce865f1760e6984 (diff)
downloadsamba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.tar.gz
samba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.tar.xz
samba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.zip
selftest: Set winbind separator = /
This avoids a pile of shell-script escape pain, and fixes some tests. Andrew Bartlett Change-Id: Ie1d0e32ab484a5b0ddbc4073831fe6de27e38e92 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'selftest')
-rw-r--r--selftest/knownfail1
-rwxr-xr-xselftest/selftest.pl1
-rwxr-xr-xselftest/target/Samba3.pm1
3 files changed, 2 insertions, 1 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 35dba207182..9e369c1588d 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -242,7 +242,6 @@
#
# The Samba4 winbind does not cover the full winbind protocol, so these are expected
#
-^samba3.winbind.struct.info\(plugin_s4_dc\)
^samba3.winbind.struct.show_sequence\(plugin_s4_dc\)
^samba3.winbind.wbclient.wbcPingDc\(plugin_s4_dc\)
^samba3.winbind.wbclient.wbcPingDc2\(plugin_s4_dc\)
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 97b24ed8658..831ebd90f8d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -545,6 +545,7 @@ sub write_clientconf($$$)
resolv:host file = $prefix_abs/dns_host_file
#We don't want to run 'speed' tests for very long
torture:timelimit = 1
+ winbind separator = /
";
close(CF);
}
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 59ad4d5dcbb..a6d85ccd6f1 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1020,6 +1020,7 @@ sub provision($$$$$$)
idmap config * : range = 100000-200000
winbind enum users = yes
winbind enum groups = yes
+ winbind separator = /
# min receivefile size = 4000