From 7e7cd07c405f8b66f5979047cb1a50e1e7a55edd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 27 Jan 2013 12:15:50 +0100 Subject: [PATCH] selftest: rename 'promoted_vampire_dc' to 'promoted_dc' 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 Reviewed-by: Andrew Bartlett --- selftest/target/Samba4.pm | 18 +++++++++--------- source4/selftest/tests.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index a08e5507003..8ad62326cda 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -995,7 +995,7 @@ sub provision_rpc_proxy($$$) return $ret; } -sub provision_promoted_vampire_dc($$$) +sub provision_promoted_dc($$$) { my ($self, $prefix, $dcvars) = @_; print "PROVISIONING VAMPIRE DC..."; @@ -1056,9 +1056,9 @@ sub provision_promoted_vampire_dc($$$) return undef; } - $ret->{PROMOTED_VAMPIRE_DC_SERVER} = $ret->{SERVER}; - $ret->{PROMOTED_VAMPIRE_DC_SERVER_IP} = $ret->{SERVER_IP}; - $ret->{PROMOTED_VAMPIRE_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; + $ret->{PROMOTED_DC_SERVER} = $ret->{SERVER}; + $ret->{PROMOTED_DC_SERVER_IP} = $ret->{SERVER_IP}; + $ret->{PROMOTED_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; @@ -1632,11 +1632,11 @@ sub setup_env($$$) $self->setup_dc("$path/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})) { $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") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); @@ -1830,18 +1830,18 @@ sub setup_vampire_dc($$$) return $env; } -sub setup_promoted_vampire_dc($$$) +sub setup_promoted_dc($$$) { 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) { $self->check_or_start($env, "single"); $self->wait_for_start($env); - $self->{vars}->{promoted_vampire_dc} = $env; + $self->{vars}->{promoted_dc} = $env; # force replicated DC to update repsTo/repsFrom # for vampired partitions diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 568d1223619..5321500cefd 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -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']) # 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]) # TODO: Verifying the databases really should be a part of the # environment teardown. # 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]) -- 2.11.4.GIT