diff options
| author | Jeremy Allison <jra@samba.org> | 2011-10-28 12:15:51 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-10-28 12:16:43 -0700 |
| commit | 8c6ff21782b141571dde64e80cc42540e9177a23 (patch) | |
| tree | d2adc56dc1b173620061fff0b9f80e65d6963d4a | |
| parent | 3bd6513884f1f02fe5638a424bcb1948f0921853 (diff) | |
| download | samba-8c6ff21782b141571dde64e80cc42540e9177a23.tar.gz samba-8c6ff21782b141571dde64e80cc42540e9177a23.tar.bz2 samba-8c6ff21782b141571dde64e80cc42540e9177a23.zip | |
The xcopy test is used in unusual ways (via a different uid). Ensure we can cope with this.
| -rwxr-xr-x | selftest/target/Samba3.pm | 5 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 7 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 18 |
3 files changed, 21 insertions, 9 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 6c0e437785..3c0fbe9220 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1003,6 +1003,11 @@ sub provision($$$$$$$) copy = print1 [lp] copy = print1 +[xcopy_share] + path = $shrdir + comment = smb username is [%U] + create mask = 777 + force create mode = 777 [print\$] copy = tmp "; diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 6d67229289..506bbeefc1 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -751,6 +751,13 @@ sub provision($$$$$$$$$) posix:oplocktimeout = 3 posix:writetimeupdatedelay = 500000 +[xcopy_share] + path = $ctx->{tmpdir} + read only = no + posix:sharedelay = 10000 + posix:oplocktimeout = 3 + posix:writetimeupdatedelay = 500000 + [test1] path = $ctx->{tmpdir}/test1 read only = no diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index f7847645dd..6e61b7340c 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -340,7 +340,7 @@ for mech in [ for signing in ["--signing=on", "--signing=required"]: signoptions = "%s %s" % (mech, signing) name = "smb.signing on with %s" % signoptions - plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) + plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) for mech in [ "-k no", @@ -349,12 +349,12 @@ for mech in [ "-k yes"]: signoptions = "%s --signing=off" % mech name = "smb.signing disabled on with %s" % signoptions - plantestsuite_loadlist("samba4.%s domain-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) + plantestsuite_loadlist("samba4.%s domain-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) if have_ads_support: - plantestsuite_loadlist("samba4.%s domain-creds" % name, "s3member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) - plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) + plantestsuite_loadlist("samba4.%s domain-creds" % name, "s3member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) + plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) plantestsuite_loadlist("samba4.%s administrator" % name, "plugin_s4_dc", - [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) + [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) for mech in [ "-k no", @@ -362,11 +362,11 @@ for mech in [ "-k no --option=gensec:spengo=no"]: signoptions = "%s --signing=off" % mech name = "smb.signing on with %s" % signoptions - plantestsuite_loadlist("samba4.%s local-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy']) + plantestsuite_loadlist("samba4.%s local-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy']) -plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy']) -plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy']) -plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy']) +plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy']) +plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=required', '-U%', 'base.xcopy']) +plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=no', '-U%', 'base.xcopy']) wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""] |