File 3551-snmp-test-Remove-the-skip-check-for-windows-on-virtu.patch of Package erlang
From 3ad624343a00e864f1a4f1873dd46a2b323ef830 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 14 Dec 2020 09:52:59 +0100
Subject: [PATCH 2/3] [snmp|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/snmp/test/snmp_test_lib.erl | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index d4e7c53e0a..1828e62ffb 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -642,7 +642,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
@@ -701,14 +701,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},
{darwin, DarwinVersionVerify}]},
--
2.26.2