s4/selftest: Use s3 smbclient for samba4.blackbox.bogusdomain

Additionally remove the test from skip_smb1_fails

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 55d6ea003bdda8e8d3c86e69929d34469c5d3943..72d8fdc8b2da7fdca2af2d0aa15e477cc564aaa5 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -353,7 +353,6 @@
 ^samba3.unix.whoami\(nt4_member\)
 ^samba3.unix.whoami ntlm user@realm\(ad_dc\)
 ^samba3.unix.whoami ntlm user@realm\(ad_member\)
-^samba4.blackbox.bogusdomain\(ad_member\)
 ^samba4.blackbox.chgdcpass\(chgdcpass\)
 ^samba4.blackbox.kinit\(fl2000dc:local\)
 ^samba4.blackbox.kinit\(fl2008r2dc:local\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index bbceaebbb4338800d43525f3e637d9bfa6225b7e..f9d48018a1c83e4ee4426881b4c2e33930d564c8 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -562,7 +562,7 @@ for mech in [
     plansmbtorture4testsuite('base.xcopy', "ad_dc",
                              ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
 
-plantestsuite("samba4.blackbox.bogusdomain", "ad_member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient4])
+plantestsuite("samba4.blackbox.bogusdomain", "ad_member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient3])
 for mech in [
     "-k no",
     "-k no --option=clientusespnego=no",