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

Start and kill kvm instance properly.

Browse Source 
(This used to be commit 78e49765a2)
This commit is contained in:
Jelmer Vernooij 2008-02-19 15:12:57 +01:00
parent 12ea7dd325
commit 87f611ed69
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/selftest/config.mk
View File

@ -13,6 +13,9 @@ test:: everything
kvmtest:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --target=kvm --image=$(KVM_IMAGE)
kvmquicktest:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --quick --target=kvm --image=$(KVM_IMAGE)
testone:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)

2
source4/selftest/selftest.pl
View File

@ -303,7 +303,7 @@ Samba3 Specific:
--bindir=PATH path to binaries
Kvm Specific:
--image=PATH path to KVM image
--image=PATH path to KVM image
Behaviour:
--quick run quick overall test

45
source4/selftest/target/Kvm.pm
View File

@ -11,9 +11,9 @@ use FindBin qw($RealBin);
use POSIX;
sub new($$$$) {
my ($classname, $image) = @_;
my ($classname, $dc_image) = @_;
my $self = {
image => $image
dc_image => $dc_image,
};
bless $self;
return $self;
@ -23,6 +23,10 @@ sub teardown_env($$)
{
my ($self, $envvars) = @_;
print "Killing kvm instance $envvars->{KVM_PID}\n";
kill 9, $envvars->{KVM_PID};
return 0;
}
@ -37,22 +41,26 @@ sub check_env($$)
{
my ($self, $envvars) = @_;
# FIXME: Check whether $self->{pid} is still running
return 1;
}
sub start($)
sub start($$$)
{
my ($self) = @_;
my ($self, $path, $image) = @_;
my $pidfile = "kvm.pid";
my $pidfile = "$path/kvm.pid";
my $opts = ($ENV{KVM_OPTIONS} or "");
system("kvm $opts -daemonize -pidfile $pidfile -vnc unix:kvm.vnc -snapshot $self->{image}");
system("kvm $opts -daemonize -pidfile $pidfile -vnc unix:$path/kvm.vnc -snapshot $image");
open(PID, $pidfile);
$self->{pid} = <PID>;
<PID> =~ /([0-9]+)/;
my ($pid) = $1;
close(PID);
return $pid;
}
sub setup_env($$$)
@ -60,21 +68,30 @@ sub setup_env($$$)
my ($self, $envname, $path) = @_;
if ($envname eq "dc") {
unless (defined($self->{pid})) {
$self->start();
$self->{dc_pid} = $self->start($path, $self->{dc_image});
if ($envname eq "dc") {
return {
KVM_PID => $self->{dc_pid},
USERNAME => "Administrator",
PASSWORD => "penguin",
DOMAIN => "SAMBA",
REALM => "SAMBA",
SERVER => "",
SERVER_IP => "",
NETBIOSNAME => "",
NETBIOSALIAS => "",
};
} else {
return undef;
}
} elsif ($envname eq "member") {
} else {
return undef;
}
die("No implemented yet");
}
sub stop($)
{
my ($self) = @_;
kill $self->{pid};
}
1;