sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

selftest: add snapshot share configuration

Browse Source 
Define a share that uses both vfs_shell_snap and fake_snap.pl to create,
delete and expose fake snapshots in response to FSRVP requests.
Additionally test snapshot enumeration and access via the shadow_copy2
module.

Allow for simple testing of FSRVP message sequence timeouts, by
specifying an artificially small interval.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
David Disseldorp 2013-05-15 00:42:35 +02:00 committed by Jeremy Allison
parent 7a96325baa
commit 2e9ea9f195
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/selftesthelpers.py
View File

@ -166,6 +166,7 @@ smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], st
smbtorture4_options = [ smbtorture4_options = [
configuration, configuration,
"--option=\'fss:sequence timeout=1\'",
"--maximum-runtime=$SELFTEST_MAXTIME", "--maximum-runtime=$SELFTEST_MAXTIME",
"--basedir=$SELFTEST_TMPDIR", "--basedir=$SELFTEST_TMPDIR",
"--format=subunit" "--format=subunit"

18
selftest/target/Samba3.pm
View File

@ -212,10 +212,13 @@ sub setup_nt4_dc($$)
rpc_server:samr = external rpc_server:samr = external
rpc_server:netlogon = external rpc_server:netlogon = external
rpc_server:register_embedded_np = yes rpc_server:register_embedded_np = yes
rpc_server:FssagentRpc = external
rpc_daemon:epmd = fork rpc_daemon:epmd = fork
rpc_daemon:spoolssd = fork rpc_daemon:spoolssd = fork
rpc_daemon:lsasd = fork rpc_daemon:lsasd = fork
rpc_daemon:fssd = fork
fss: sequence timeout = 1
"; ";
my $vars = $self->provision($path, my $vars = $self->provision($path,
@ -1071,6 +1074,8 @@ sub provision($$$$$$$$)
my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl"; my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
my $fake_snap_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/fake_snap.pl";
my @eventlog_list = ("dns server", "application"); my @eventlog_list = ("dns server", "application");
## ##
@ -1198,6 +1203,9 @@ sub provision($$$$$$$$)
# sending messages works, and that the %m sub works. # sending messages works, and that the %m sub works.
message command = mv %s $shrdir/message.%m message command = mv %s $shrdir/message.%m
# fsrvp server requires registry shares
registry shares = yes
# Begin extra options # Begin extra options
$extra_options $extra_options
# End extra options # End extra options
@ -1333,6 +1341,16 @@ sub provision($$$$$$$$)
[dynamic_share] [dynamic_share]
path = $shrdir/%R path = $shrdir/%R
guest ok = yes guest ok = yes
[fsrvp_share]
path = $shrdir
comment = fake shapshots using rsync
vfs objects = shell_snap shadow_copy2
shell_snap:check path command = $fake_snap_pl --check
shell_snap:create command = $fake_snap_pl --create
shell_snap:delete command = $fake_snap_pl --delete
# a relative path here fails, the snapshot dir is no longer found
shadow:snapdir = $shrdir/.snapshots
"; ";
close(CONF); close(CONF);