[2/2b] testbot/lib: Set the VM status to running in Task::Run().
Francois Gouget
fgouget at codeweavers.com
Tue May 6 05:43:14 CDT 2014
It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status.
---
Conceptually this is independent from patch 1 but it touches the same
area of the code...
testbot/lib/WineTestBot/Jobs.pm | 5 +----
testbot/lib/WineTestBot/Tasks.pm | 8 ++++++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index b042bea..4532d4e 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -507,11 +507,8 @@ sub ScheduleOnHost($$$)
{
$IdleVMs{$VMKey} = 0;
$IdleCount--;
- $VM->Status("running");
- my ($ErrProperty, $ErrMessage) = $VM->Save();
- return $ErrMessage if (defined $ErrMessage);
- $ErrMessage = $Task->Run($Step);
+ my $ErrMessage = $Task->Run($Step);
return $ErrMessage if (defined $ErrMessage);
$Job->UpdateStatus();
diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm
index fd848f2..dd22749 100644
--- a/testbot/lib/WineTestBot/Tasks.pm
+++ b/testbot/lib/WineTestBot/Tasks.pm
@@ -79,6 +79,11 @@ sub Run($$)
$self->Status("running");
$self->Save();
+ my $VM = $self->VM;
+ $VM->Status("running");
+ my ($ErrProperty, $ErrMessage) = $VM->Save();
+ return $ErrMessage if (defined $ErrMessage);
+
my $RunScript;
if ($Step->Type eq "build")
{
@@ -131,8 +136,7 @@ sub Run($$)
# ChildPid should be ignored anyway if Status is not 'running'.
$self->ChildPid($Pid);
$self->Started(time);
- my ($ErrProperty, $ErrMessage) = $self->Save();
-
+ ($ErrProperty, $ErrMessage) = $self->Save();
return $ErrMessage;
}
--
2.0.0.rc0
More information about the wine-patches
mailing list