September 2019 - Wine-commits

Brendan Shanks : user32/tests: Test GetWindowInfo error conditions and incorrect cbSize.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 38dd9faf96eb8ea464ee095c92faa83761c032ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=38dd9faf96eb8ea464ee095c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 23 10:41:06 2019 -0700 user32/tests: Test GetWindowInfo error conditions and incorrect cbSize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 75 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c6fbd7c12a..6b600cb1bc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -24,6 +24,7 @@ #define _WIN32_WINNT 0x0501 #include <assert.h> +#include <limits.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -996,6 +997,61 @@ if (0) "wrong wCreatorVersion %04x for %p in hook %s\n", info->wCreatorVersion, hwnd, hook); } +static void test_window_info(const char *hook, HWND hwnd) +{ + WINDOWINFO info, info2; + + if (0) /* crashes on Win10 */ + ok(!pGetWindowInfo(hwnd, NULL), "GetWindowInfo should fail\n"); + + if (0) { /* crashes on XP, 2003 */ + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, &info), "GetWindowInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + + info.cbSize = sizeof(WINDOWINFO); + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + verify_window_info(hook, hwnd, &info); + + /* test different cbSize values. + * Windows ignores it (except for Win98, according to an old comment). + */ + memset(&info, 0xcc, sizeof(WINDOWINFO)); + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + + info.cbSize = sizeof(WINDOWINFO); + info2.cbSize = sizeof(WINDOWINFO); + + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "identical GetWindowInfo calls produce different result\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = 0; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = sizeof(WINDOWINFO)/2; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = UINT_MAX; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); +} + static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyle) { AdjustWindowRectEx(rc, style, menu, exstyle); @@ -1172,12 +1228,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) ok(createwnd->hwndInsertAfter == HWND_TOP, "hwndInsertAfter should be always HWND_TOP\n"); if (pGetWindowInfo) - { - WINDOWINFO info; - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; @@ -1238,17 +1289,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) case HCBT_MINMAX: case HCBT_ACTIVATE: if (pGetWindowInfo && IsWindow(hwnd)) - { - WINDOWINFO info; - - /* Win98 actually does check the info.cbSize and doesn't allow - * it to be anything except sizeof(WINDOWINFO), while Win95, Win2k, - * WinXP do not check it at all. - */ - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); break; /* window state is undefined */ case HCBT_SETFOCUS:

1 0

Brendan Shanks : user32: Fix behavior of GetWindowInfo(0, NULL).
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: c8dbb0c4c1ec4cc7979715a6ebc02ece90ae220e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8dbb0c4c1ec4cc7979715a6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 23 10:41:07 2019 -0700 user32: Fix behavior of GetWindowInfo(0, NULL). Windows doesn't do a NULL check on the WINDOWINFO pointer. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 +- dlls/user32/win.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b600cb1bc..784849b2ba 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1007,7 +1007,7 @@ static void test_window_info(const char *hook, HWND hwnd) if (0) { /* crashes on XP, 2003 */ SetLastError(0xdeadbeef); ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3582262b7d..3323ed3e41 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3845,9 +3845,13 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { + RECT rcWindow, rcClient; + + if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &rcWindow, &rcClient )) return FALSE; if (!pwi) return FALSE; - if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE; + pwi->rcWindow = rcWindow; + pwi->rcClient = rcClient; pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); pwi->dwWindowStatus = ((GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0);

1 0

Francois Gouget : testbot/WineRunReconfig: Fix a typo in a comment.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: a46113d323c778a50a1e783ccd216d06b7e3f00f URL: https://source.winehq.org/git/tools.git/?a=commit;h=a46113d323c778a50a1e783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 10:58:59 2019 +0200 testbot/WineRunReconfig: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index a443027..fe36ad0 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -468,7 +468,7 @@ if ($NewStatus eq "completed") if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and -f "$DataDir/latest/$BaseName") { - # This file was not updated to there is no point redownloading it. + # This file was not updated so there is no point in redownloading it. next; } Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n");

1 0

Francois Gouget : testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: c5a6fa1b41b03452bb2167b002fb8056086c1ad0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5a6fa1b41b03452bb2167b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:04 2019 +0200 testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails. In case there is a doubt they now explicitly indicate which command failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Notify.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index ddb14d2..de73425 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -82,7 +82,7 @@ sub Shutdown($$) my $Reply = SendCmdReceiveReply("shutdown $KillTasks $KillVMs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the Shutdown command"; } if (substr($Reply, 0, 1) eq "1") { @@ -105,7 +105,7 @@ sub JobStatusChange($$$) my $Reply = SendCmdReceiveReply("jobstatuschange $JobKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobStatusChange command"; } if (substr($Reply, 0, 1) eq "1") { @@ -122,7 +122,7 @@ sub JobCancel($) my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobCancel command"; } if (substr($Reply, 0, 1) eq "1") { @@ -139,7 +139,7 @@ sub JobRestart($) my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobRestart command"; } if (substr($Reply, 0, 1) eq "1") { @@ -154,7 +154,7 @@ sub RescheduleJobs() my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the RescheduleJobs command"; } if (substr($Reply, 0, 1) eq "1") { @@ -171,7 +171,7 @@ sub VMStatusChange($$$) my $Reply = SendCmdReceiveReply("vmstatuschange $VMKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the VMStatusChange notification"; } if (substr($Reply, 0, 1) eq "1") { @@ -186,7 +186,7 @@ sub WinePatchMLSubmission() my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchMLSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -201,7 +201,7 @@ sub WinePatchWebSubmission() my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchWebSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -218,7 +218,7 @@ sub GetScreenshot($) my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the GetScreenshot command"; } if (substr($Reply, 0, 1) eq "1") {

1 0

Francois Gouget : testbot: SetupRedirects() should not depend on prior logging.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: b360a0b5e2b0099e8ba3b326ccb9905aa3d4ff6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b360a0b5e2b0099e8ba3b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:15 2019 +0200 testbot: SetupRedirects() should not depend on prior logging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index c39a557..7ac4dab 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -33,26 +33,28 @@ use WineTestBot::Config; my $logfile; my $logprefix; -sub LogMsg(@) +sub SetupLogging() { - if (!defined $logfile) + require File::Basename; + $logprefix = File::Basename::basename($0); + $logprefix =~ s/\.[^.]*$//; + my $oldumask = umask(002); + if (!open($logfile, ">>", "$LogDir/log")) { - require File::Basename; - $logprefix = File::Basename::basename($0); - $logprefix =~ s/\.[^.]*$//; - my $oldumask = umask(002); - if (!open($logfile, ">>", "$LogDir/log")) - { - print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; - open($logfile, ">>&=", 2); - } - umask($oldumask); - - # Flush after each print - my $tmp=select($logfile); - $| = 1; - select($tmp); + print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; + open($logfile, ">>&=", 2); } + umask($oldumask); + + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); +} + +sub LogMsg(@) +{ + SetupLogging() if (!defined $logfile); print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } @@ -75,19 +77,18 @@ exec()-ing external tools so their error messages are not lost. sub SetupRedirects() { - if (defined $logfile) + SetupLogging() if (!defined $logfile); + + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp = select(STDERR); + $| = 1; + select($tmp); + } + else { - if (open(STDERR, ">>&", $logfile)) - { - # Make sure stderr still flushes after each print - my $tmp=select(STDERR); - $| = 1; - select($tmp); - } - else - { - LogMsg "unable to redirect stderr to '$logfile': $!\n"; - } + LogMsg "unable to redirect stderr to '$logfile': $!\n"; } }

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if the build fails.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: df877ab52c672562541f78fba602ea1bf123e5b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=df877ab52c672562541f78f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:40 2019 +0200 testbot/WineRunReconfig: Notify the administrator if the build fails. Build failures prevent the TestBot snapshot from being updated (leading to an out-of-date Wine and patches that fail to apply) and can typically only be fixed manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index fe36ad0..063bab2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -438,6 +438,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + NotifyAdministrator("The ". $VM->Name ." build failed", + "The ". $VM->Name ." build failed:\n\n". + "$Summary->{Task}\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } }

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 51503c04fea1dd065f35b921b9a3e19dc0cd3d20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51503c04fea1dd065f35b92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:01:12 2019 +0200 testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed. It's possible that the connection to the hypervisor was lost right when the snapshot was being recreated. The TestBot may also be able to recreate the snapshot from the powered off base snapshot. But such failures are rare enough to warrant an investigation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 063bab2..bfbc5ab 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -518,6 +518,11 @@ if ($NewStatus eq 'completed') # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. + NotifyAdministrator("The ". $VM->Name ." update failed", + "Could not recreate the $IdleSnapshot snapshot:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); }

1 0

Francois Gouget : testbot/testagentd: Fix upgrades when there is more than one server running.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 2d8e40dad69c325415f927d37970a7849942f6b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2d8e40dad69c325415f927d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:04:13 2019 +0200 testbot/testagentd: Fix upgrades when there is more than one server running. On Windows the second server will keep the old executable busy, preventing its deletion. So give up after a while. Usually the second server will be running with --set-time-only so upgrading it is not as important. If necessary this condition can be detected on the client by attempting to delete the old executable and checking for an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index bb52a02..2d971a4 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -532,17 +532,20 @@ int platform_init(void) { /* This also serves to ensure the old server has released the port * before we attempt to open our own. + * But if a second server is running the deletion will never work so + * give up after a while. */ + int attempt = 0; do { if (!DeleteFileA(oldtestagentd)) Sleep(500); + attempt++; } - while (GetLastError() == ERROR_ACCESS_DENIED); + while (GetLastError() == ERROR_ACCESS_DENIED && attempt < 20); free(oldtestagentd); } - wVersionRequested = MAKEWORD(2, 2); rc = WSAStartup(wVersionRequested, &wsaData); if (rc)

1 0

Francois Gouget : testbot/TestAgent: Add the restart RPC.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 28c6aeaf86ddf6b8454d6ce59b5f1f16f50f4b82 URL: https://source.winehq.org/git/tools.git/?a=commit;h=28c6aeaf86ddf6b8454d6ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:06:43 2019 +0200 testbot/TestAgent: Add the restart RPC. This is similar to the upgrade RPC but leaves out sending the new server binary and allows changing the server command line which makes it more flexible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 52 ++++++++ testbot/scripts/TestAgent | 14 ++- testbot/src/testagentd/platform.h | 2 +- testbot/src/testagentd/platform_unix.c | 45 +++++-- testbot/src/testagentd/platform_windows.c | 199 ++++++++++++++++++++++++++++-- testbot/src/testagentd/testagentd.c | 72 ++++++++++- 6 files changed, 356 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=28c6aeaf86ddf6b8454…

1 0

Francois Gouget : testbot/LibvirtTool: Move the TestAgentd check to a separate function.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 51f44f2c29d396162aa175f12394ba28e9236dc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51f44f2c29d396162aa175f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:09:49 2019 +0200 testbot/LibvirtTool: Move the TestAgentd check to a separate function. GetVersion() is equivalent to Ping() but can be used to perform version checks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4635443..dd330a5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,6 +365,23 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub SetupTestAgentd($$) +{ + my ($VM, $Booting) = @_; + + Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); + LogMsg "Setting up the $VMKey TestAgent server\n"; + my $TA = $VM->GetAgent(); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->Disconnect(); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -402,18 +419,8 @@ sub Revert() # The VM is now sleeping which may allow some tasks to run return 1 if (ChangeStatus("reverting", "sleeping")); - # Verify that the TestAgent server accepts connections - Debug(Elapsed($Start), " Verifying the TestAgent server\n"); - LogMsg "Verifying the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); - my $Success = $TA->Ping(); - $TA->Disconnect(); - if (!$Success) - { - $ErrMessage = $TA->GetLastError(); - FatalError("Cannot connect to the $VMKey TestAgent: $ErrMessage\n"); - } + # Set up the TestAgent server + SetupTestAgentd($VM, $Booting); if ($SleepAfterRevert != 0) {

1 0