From 5f1fcb59e5de6ef58fd329348967ea1452b1e4ef Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sat, 14 Sep 2024 23:34:38 +0200 Subject: [PATCH] [0.4.15][WINETESTS] Exclude 2 tests: mshmtl:htmldoc, urlmon:protocol ROSTESTS-358 I am really no fan of disabling tests, even when they are broken, but in these cases they are really not worth of suffering the pain, and rerunning the bots all the time. Those tests do have random failures and timeouts, and are accessing external web-resources of the Wine test-infratructure, which are not always accessible. I do disable them, because they very often make the testruns run extremely long. "Inspired by" 0.4.15-dev-367-g d424a0e08818b28e81c8bf12a330804c663d199c urlmon_winetest:url skipped due to frequent hang on Test KVM This following links do reflect the BEFORE-STATE: The "urlmon:protocol" test does even crash on the WHS x86 testbot, see: https://reactos.org/testman/compare.php?ids=97640 0.4.14-release-123-gcc9c2ba: VBox https://reactos.org/testman/compare.php?ids=97825 KVM https://reactos.org/testman/compare.php?ids=97826 (both timed out at urlmon:url) 0.4.15-2-g94cae27: VBox https://reactos.org/testman/compare.php?ids=97837 KVM https://reactos.org/testman/compare.php?ids=97838 Yes, even older branches might also be affected, but I will only exclude them for now on releases/0.4.14 and releases/0.4.15 because only on those I do regularly run the testbots still. --- modules/rostests/winetests/mshtml/htmldoc.c | 6 ++++++ modules/rostests/winetests/urlmon/protocol.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/rostests/winetests/mshtml/htmldoc.c b/modules/rostests/winetests/mshtml/htmldoc.c index 78583894f0a..5c917feae49 100644 --- a/modules/rostests/winetests/mshtml/htmldoc.c +++ b/modules/rostests/winetests/mshtml/htmldoc.c @@ -8556,6 +8556,12 @@ static void test_ServiceProvider(void) START_TEST(htmldoc) { + if (!winetest_interactive) + { + win_skip("Skipping mshtml:htmldoc due to hang ROSTESTS-358\n"); + return; + } + CoInitialize(NULL); if(!check_ie()) { diff --git a/modules/rostests/winetests/urlmon/protocol.c b/modules/rostests/winetests/urlmon/protocol.c index 3f8a99967f2..f16aba11b3f 100644 --- a/modules/rostests/winetests/urlmon/protocol.c +++ b/modules/rostests/winetests/urlmon/protocol.c @@ -4255,6 +4255,12 @@ START_TEST(protocol) { HMODULE hurlmon; + if (!winetest_interactive) + { + win_skip("Skipping urlmon:protocol due to hang ROSTESTS-358\n"); // FIXME: It crashes even on WHS testbot https://reactos.org/testman/compare.php?ids=97640 + return; + } + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");