Francois Gouget : testbot/LibvirtTool: Always use a default deadline if none is set.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 60983ec383784ad530b06329cd64c62b46ffede8
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=60983ec383784ad530b06329...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Mar 15 10:29:54 2021 +0100

testbot/LibvirtTool: Always use a default deadline if none is set.

VM->ChildDeadline may be unset not only while in debug mode if the VM
is in maintenance mode, but also if another VM sharing the same
hypervisor domain is in maintenance mode.
So rather than relying on the VM status, just use a default value as a
fallback.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/bin/LibvirtTool.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index f3ea198..f135b9b 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -579,8 +579,7 @@ sub Revert()
   if ($ExtraTimeout)
   {
     Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n");
-    my $Deadline = $VM->Status eq "maintenance" ? (time() + $VMToolTimeout) :
-                                                  $VM->ChildDeadline;
+    my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout);
     $VM->ChildDeadline($Deadline + $ExtraTimeout);
     $VM->Save();
   }