Francois Gouget : testbot/Engine: Fix recording the new sacrificed VM status.
Alexandre Julliard
julliard at winehq.org
Mon Sep 23 14:35:46 CDT 2019
Module: tools
Branch: master
Commit: d1075ec8f78e9e4e928b4f7cceb15ead53b3a9ed
URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1075ec8f78e9e4e928b4f7cceb15ead53b3a9ed
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Sep 23 19:22:00 2019 +0200
testbot/Engine: Fix recording the new sacrificed VM status.
The status will not be 'dirty' if VM::RunPowerOff() failed.
Recording the right status is important otherwise ScheduleJobs() will
attempt to record de VM's current status in its catch-all loop,
resulting in a fatal 'Could not change key' error.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm
index 4128e9e..530a2ee 100644
--- a/testbot/lib/WineTestBot/Engine/Scheduler.pm
+++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm
@@ -764,10 +764,10 @@ sub _SacrificeVM($$$)
$Sched->{busyvms}->{$VictimKey} = 1;
$Host->{$Victim->Status}--;
$Host->{dirty}++;
- $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice");
$Victim->KillChild();
my $ErrMessage = $Victim->RunPowerOff();
LogMsg "$ErrMessage\n" if (defined $ErrMessage);
+ $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : $VM->Status ." sacrifice");
return 1;
}
More information about the wine-cvs
mailing list