File 5671-megaco-test-Remove-the-skip-check-for-windows-on-vir.patch of Package erlang
From eadd9fe9fc3d9e974896c2acc71e7c4ef5d3c540 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 14 Dec 2020 09:53:35 +0100
Subject: [PATCH 3/3] [megaco|test] Remove the skip check for windows on
virtual
No skip on Windows on VMs. The problem host has been replaced
and the (windows) VM reinstalled. So maybe it will work now?
---
lib/megaco/test/megaco_test_lib.erl | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 49168ea565..a04b27a061 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -494,7 +494,7 @@ init_per_suite(Config) ->
SKIP
end.
-maybe_skip(HostInfo) ->
+maybe_skip(_HostInfo) ->
%% We have some crap machines that causes random test case failures
%% for no obvious reason. So, attempt to identify those without actually
@@ -553,14 +553,19 @@ maybe_skip(HostInfo) ->
true
end,
SkipWindowsOnVirtual =
+ %% fun() ->
+ %% SysMan = win_sys_info_lookup(system_manufacturer, HostInfo),
+ %% case string:to_lower(SysMan) of
+ %% "vmware" ++ _ ->
+ %% true;
+ %% _ ->
+ %% false
+ %% end
+ %% end,
fun() ->
- SysMan = win_sys_info_lookup(system_manufacturer, HostInfo),
- case string:to_lower(SysMan) of
- "vmware" ++ _ ->
- true;
- _ ->
- false
- end
+ %% The host has been replaced and the VM has been reinstalled
+ %% so for now we give it a chance...
+ false
end,
COND = [
{unix, [{linux, LinuxVersionVerify},
--
2.26.2