diff options
author | Michael Adam <obnox@samba.org> | 2012-05-30 11:57:16 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
commit | da82c07e13d1d4ecd32c4b040477f12b2388941c (patch) | |
tree | 3fc83f6ee1857b72a1cbe7b69374d2080b5aa9f4 | |
parent | 11a2eeabaaf17be5475dce0cfed3022b08937876 (diff) | |
download | samba-da82c07e13d1d4ecd32c4b040477f12b2388941c.tar.gz samba-da82c07e13d1d4ecd32c4b040477f12b2388941c.tar.bz2 samba-da82c07e13d1d4ecd32c4b040477f12b2388941c.zip |
s4:selftets: change the blackbox.bogusdomain test to use binary mapping for smbclient
-rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
-rwxr-xr-x | testprogs/blackbox/bogus.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index eb92038b52..ba50a93399 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -361,7 +361,7 @@ for mech in [ plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name) -plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD']) +plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient]) for mech in [ "-k no", "-k no --option=usespnego=no", diff --git a/testprogs/blackbox/bogus.sh b/testprogs/blackbox/bogus.sh index 68bab03f9c..be67e1992e 100755 --- a/testprogs/blackbox/bogus.sh +++ b/testprogs/blackbox/bogus.sh @@ -15,11 +15,11 @@ USER=$3 PWD=$4 DC_USER=$5 DC_PWD=$6 -shift 6 +smbclient=$7 +shift 7 TEST_USER=bogus_testuser TEST_PWD=bogus_pass3#@ -smbclient="$BINDIR/smbclient" net="$BINDIR/net" testit_expect_failure "smbclient" $smbclient "//$SERVER/$SHARE" -W POUET -U$DC_USER%$DC_PWD -c "dir"&& failed=`expr $failed + 1` testit "net.user.add" $net rpc user add $TEST_USER $TEST_PWD -W $SERVER -U$SERVER\\$USER%$PWD -S $SERVER |