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

selftest: rename 'promoted_vampire_dc' to 'promoted_dc'

Browse Source 
Unix domain socket are limited to 104 characters on Linux.

Using something like this fails as it uses more than 104 characters:
'/memdisk/autobuild/flakey/b232141/samba/bin/ab/promoted_vampire_dc/private/smbd.tmp/msg/msg.482379.2147483647'

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-01-27 12:15:50 +01:00
parent 0f8ef5a2c8
commit 7e7cd07c40
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
selftest/target/Samba4.pm
View File

@ -995,7 +995,7 @@ sub provision_rpc_proxy($$$)
return $ret; return $ret;
} }
sub provision_promoted_vampire_dc($$$) sub provision_promoted_dc($$$)
{ {
my ($self, $prefix, $dcvars) = @_; my ($self, $prefix, $dcvars) = @_;
print "PROVISIONING VAMPIRE DC..."; print "PROVISIONING VAMPIRE DC...";
@ -1056,9 +1056,9 @@ sub provision_promoted_vampire_dc($$$)
return undef; return undef;
} }
$ret->{PROMOTED_VAMPIRE_DC_SERVER} = $ret->{SERVER}; $ret->{PROMOTED_DC_SERVER} = $ret->{SERVER};
$ret->{PROMOTED_VAMPIRE_DC_SERVER_IP} = $ret->{SERVER_IP}; $ret->{PROMOTED_DC_SERVER_IP} = $ret->{SERVER_IP};
$ret->{PROMOTED_VAMPIRE_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; $ret->{PROMOTED_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
$ret->{DC_SERVER} = $dcvars->{DC_SERVER}; $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
$ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
@ -1632,11 +1632,11 @@ sub setup_env($$$)
$self->setup_dc("$path/dc"); $self->setup_dc("$path/dc");
} }
return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc}); return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc});
} elsif ($envname eq "promoted_vampire_dc") { } elsif ($envname eq "promoted_dc") {
if (not defined($self->{vars}->{dc})) { if (not defined($self->{vars}->{dc})) {
$self->setup_dc("$path/dc"); $self->setup_dc("$path/dc");
} }
return $self->setup_promoted_vampire_dc("$path/promoted_vampire_dc", $self->{vars}->{dc}); return $self->setup_promoted_dc("$path/promoted_dc", $self->{vars}->{dc});
} elsif ($envname eq "subdom_dc") { } elsif ($envname eq "subdom_dc") {
if (not defined($self->{vars}->{dc})) { if (not defined($self->{vars}->{dc})) {
$self->setup_dc("$path/dc"); $self->setup_dc("$path/dc");
@ -1830,18 +1830,18 @@ sub setup_vampire_dc($$$)
return $env; return $env;
} }
sub setup_promoted_vampire_dc($$$) sub setup_promoted_dc($$$)
{ {
my ($self, $path, $dc_vars) = @_; my ($self, $path, $dc_vars) = @_;
my $env = $self->provision_promoted_vampire_dc($path, $dc_vars); my $env = $self->provision_promoted_dc($path, $dc_vars);
if (defined $env) { if (defined $env) {
$self->check_or_start($env, "single"); $self->check_or_start($env, "single");
$self->wait_for_start($env); $self->wait_for_start($env);
$self->{vars}->{promoted_vampire_dc} = $env; $self->{vars}->{promoted_dc} = $env;
# force replicated DC to update repsTo/repsFrom # force replicated DC to update repsTo/repsFrom
# for vampired partitions # for vampired partitions

4
source4/selftest/tests.py
View File

@ -498,10 +498,10 @@ plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" % python
plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision']) plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision'])
# Demote the vampire DC, it must be the last test on the VAMPIRE DC # Demote the vampire DC, it must be the last test on the VAMPIRE DC
for env in ['vampire_dc', 'promoted_vampire_dc']: for env in ['vampire_dc', 'promoted_dc']:
plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient4]) plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient4])
# TODO: Verifying the databases really should be a part of the # TODO: Verifying the databases really should be a part of the
# environment teardown. # environment teardown.
# check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST # check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", 'vampire_dc', 'promoted_vampire_dc']: for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", 'vampire_dc', 'promoted_dc']:
plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration]) plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration])