Francois Gouget : testbot/LibvirtTool: Only check the start count after a reboot.

Alexandre Julliard julliard at winehq.org
Mon Dec 2 13:24:48 CST 2019


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Dec  2 13:53:34 2019 +0100

testbot/LibvirtTool: Only check the start count after a reboot.

The start count check is not related to taking live snapshots.
And we can skip it if the VM was not freshly booted.

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

---

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

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index bc45533..faac0b3 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -460,14 +460,14 @@ sub SetupTestAgentd($$$$)
     # So it all works out.
     $TA->SetProperty("start.count", 0);
   }
-  else
+  elsif ($Booting)
   {
     # Check that TestAgentd is not displaying the "Has Windows rebooted?"
     # warning.
     my $Count = $TA->GetProperties("start.count");
     if (defined $Count and $Count > 1)
     {
-      FatalError("Cannot take a live snapshot because start.count=$Count > 1");
+      FatalError("The VM has been rebooted too many times: start.count=$Count > 1");
     }
   }
   $TA->Disconnect();




More information about the wine-cvs mailing list