Halt() does not wait for the VM to be powered off.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- testbot/bin/LibvirtTool.pl | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f714e48545..44b4e4950f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,6 +280,21 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); }
+sub Halt() +{ + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running: @$Cmd\n"); + my $PTA = GetPrivilegedTA($VM->GetAgent()); + if (!$PTA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; + return 0; + } + return 1; +} + =pod =over 12
@@ -305,16 +320,7 @@ sub ShutDownIfOffSnapshot()
Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - my $PTA = GetPrivilegedTA($VM->GetAgent()); - if (!$PTA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; - return 0; - } + return 0 if (!Halt());
Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); my $Deadline = time() + $WaitForShutdown;
Removing the Windows desktop wallpaper when preparing a live snapshot greatly reduces the size of the screenshots. This requires rebooting Windows independently from SetWinLocale. Note that the old WaitForBoot() code expected TestAgentd to initially be unreachable which is no longer the case since it may now be called when the TestAgentd is already running (before the reboot). The new code expects start.count to be reset to 0 before a reboot instead.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- Reducing the size of the screenshots will help when we multiple screenshots while the test is running. It will also help a bit right now given how inefficiently the website deals with the screenshots. --- testbot/bin/LibvirtTool.pl | 61 +++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 11 deletions(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 44b4e4950f..8a7d3925e8 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,18 +280,30 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); }
-sub Halt() +sub RunAndWait($$) { + my ($TA, $Cmd) = @_; + Debug(Elapsed($Start), " Running: @$Cmd\n"); + my $Ret = $TA->RunAndWait($Cmd, 0, 30); + Debug(Elapsed($Start), " $Cmd->[0] returned $Ret\n") if ($Ret); + return $Ret; +} + +sub Halt($$) +{ + my ($TA, $Reboot) = @_; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : - ["/sbin/shutdown", "--poweroff", "now"]; + ["shutdown.exe", ($Reboot ? "/r" : "/s"), "/d", "00:00", "/t", "0"] : + ["/sbin/shutdown", ($Reboot ? "--reboot" : "--poweroff"), "now"]; Debug(Elapsed($Start), " Running: @$Cmd\n"); - my $PTA = GetPrivilegedTA($VM->GetAgent()); + my $PTA = GetPrivilegedTA($TA); if (!$PTA->Run($Cmd, 0)) { Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; return 0; } + $TA->Disconnect(); return 1; }
@@ -320,7 +332,7 @@ sub ShutDownIfOffSnapshot()
Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - return 0 if (!Halt()); + return 0 if (!Halt($VM->GetAgent(), 0));
Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); my $Deadline = time() + $WaitForShutdown; @@ -466,13 +478,18 @@ sub WaitForBoot($)
Debug(Elapsed($Start), " Waiting for the VM to boot\n"); LogMsg "Waiting for $VMKey to boot\n"; - my $MinTimeout = $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$TA->GetVersion()) + + # Use small timeouts to avoid undue connection delays + my ($OneTimeout, $MinAttempts, $MinTimeout) = $TA->SetConnectTimeout(5, 1, 5); + my $Deadline = time() + $WaitForBoot; + while (time() <= $Deadline) { - my $ErrMessage = $TA->GetLastError(); - FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + my $Count = $TA->GetProperties("start.count"); + next if (!defined $Count); # Rebooting (TestAgentd is not running) + last if ($Count != 0); # start.count == 1 after the reboot + sleep(10); # Not rebooting yet } - $TA->SetConnectTimeout(undef, undef, $MinTimeout); + $TA->SetConnectTimeout($OneTimeout, $MinAttempts, $MinTimeout); }
sub WaitForSession($) @@ -582,6 +599,7 @@ sub CreateSnapshot($$$$) { my ($Domain, $TA, $Config, $Booting) = @_;
+ my $Reboot; if ($VM->Type =~ /^win(?:32|64)$/) { my $Version = $TA->GetVersion(); @@ -619,6 +637,18 @@ sub CreateSnapshot($$$$) # --set-time-only which means it cannot be upgraded since the restart RPC # is blacklisted. But that also means it's unlikely to need upgrading. # A side effect is that it will force TestAgentd.exe.old to stay around. + + # Remove the Windows desktop wallpaper so we get smaller screenshots. + # On Vista+ these require a logout+login to take effect. + if (RunAndWait($TA, ["reg.exe", "delete", "HKEY_CURRENT_USER\Control Panel\Desktop", "/v", "Wallpaper", "/f"])) + { + FatalError("Could not reset the $VMKey Windows desktop wallpaper\n"); + } + if (RunAndWait($TA, ["reg.exe", "add", "HKEY_CURRENT_USER\Control Panel\Colors", "/v", "Background", "/t", "REG_SZ", "/d", "140 20 20", "/f"])) + { + FatalError("Could not reset the $VMKey Windows desktop background color\n"); + } + $Reboot = 1; }
my @Locale; @@ -631,8 +661,9 @@ sub CreateSnapshot($$$$) if ($Config->{locale}) { push @Cmd, "--default", $Config->{locale}; - # SetWinLocale --default performs a reboot and WaitForBoot() + # SetWinLocale --default already performs a reboot and WaitForBoot() ResetBootCount($TA); + $Reboot = undef; $Booting = 1; } push @Cmd, "--utf8" if ($Config->{u8}); @@ -646,6 +677,14 @@ sub CreateSnapshot($$$$) } }
+ if ($Reboot) + { + # A reboot is still required for some changes to take effect + ResetBootCount($TA); + Halt($TA, "reboot"); + WaitForBoot($TA); + $Booting = 1; + } if ($Booting) { WaitForSession($TA);
-
Francois Gouget