summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-04 18:24:02 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-09-04 18:24:02 +0200
commit3c2b733698507e33716a2f837d6b58c34bea9b78 (patch)
treecccd66f7e3fd0b99489e37b8c2b8bab3c8429565
parent7154e93b21b0d6dcc578548e203a08b77c21d972 (diff)
downloadsamba-3c2b733698507e33716a2f837d6b58c34bea9b78.tar.gz
samba-3c2b733698507e33716a2f837d6b58c34bea9b78.tar.bz2
samba-3c2b733698507e33716a2f837d6b58c34bea9b78.zip
selftest: Remove stop() method, not used anywhere.
-rwxr-xr-xselftest/selftest.pl4
-rw-r--r--selftest/target/Kvm.pm5
-rw-r--r--selftest/target/Samba3.pm5
-rw-r--r--selftest/target/Samba4.pm8
-rw-r--r--selftest/target/Template.pm5
5 files changed, 2 insertions, 25 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 76e1886409..a345401a0a 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -555,7 +555,7 @@ sub write_clientconf($$)
my ($conffile, $vars) = @_;
mkdir("$prefix/client", 0777) unless -d "$prefix/client";
-
+
if ( -d "$prefix/client/private" ) {
unlink <$prefix/client/private/*>;
} else {
@@ -970,8 +970,6 @@ print "\n";
teardown_env($_) foreach (keys %running_envs);
-$target->stop();
-
my $failed = 0;
# if there were any valgrind failures, show them
diff --git a/selftest/target/Kvm.pm b/selftest/target/Kvm.pm
index 3b17a2909c..70fc4bf88c 100644
--- a/selftest/target/Kvm.pm
+++ b/selftest/target/Kvm.pm
@@ -159,9 +159,4 @@ sub setup_env($$$)
}
}
-sub stop($)
-{
- my ($self) = @_;
-}
-
1;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3c64e8daa4..fba0fa0fd2 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -178,11 +178,6 @@ sub setup_member($$$)
return $ret;
}
-sub stop($)
-{
- my ($self) = @_;
-}
-
sub stop_sig_term($$) {
my ($self, $pid) = @_;
kill("USR1", $pid) or kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 228f6a85d5..b4f826eac5 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -795,8 +795,7 @@ sub provision($$$$$$$$$)
$ldap_uri =~ s|/|%2F|g;
$ldap_uri = "ldapi://$ldap_uri";
$ctx->{ldap_uri} = $ldap_uri;
-
- if ($self->{ldap} eq "fedora-ds") {
+ if ($self->{ldap} eq "fedora-ds") {
$ctx->{sid_generator} = "backend";
}
@@ -1347,9 +1346,4 @@ sub setup_vampire_dc($$$)
return $env;
}
-sub stop($)
-{
- my ($self) = @_;
-}
-
1;
diff --git a/selftest/target/Template.pm b/selftest/target/Template.pm
index 25d9259668..2b47ad1e74 100644
--- a/selftest/target/Template.pm
+++ b/selftest/target/Template.pm
@@ -44,9 +44,4 @@ sub setup_env($$$)
return $envvars;
}
-sub stop($)
-{
- my ($self) = @_;
-}
-
1;