File 1562-snmp-manager-test-Use-port-0-zero-instead-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1562-snmp-manager-test-Use-port-0-zero-instead-of-5000.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From e6745fc5290b624124ca2d785114edea868db315 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 22 Nov 2021 19:09:18 +0100
Subject: [PATCH 2/2] [snmp|manager|test] Use port 0 (zero) instead of 5000

In these tests there is actually no communication, so there is no
need to use a specific port. Therefor, make the system choose
(by specifying potr = 0).

The reason for this is that it seems that on some systems, the
port (5000) seems to be still "used" (from the previous tests).

OTP-17783
---
 lib/snmp/test/snmp_manager_SUITE.erl      | 4 ++--
 lib/snmp/test/snmp_manager_user_SUITE.erl | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/snmp/test/snmp_manager_SUITE.erl b/lib/snmp/test/snmp_manager_SUITE.erl
index fdd58df696..d6db5b30df 100644
--- a/lib/snmp/test/snmp_manager_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_SUITE.erl
@@ -5869,8 +5869,8 @@ mgr_user_which_own_agents(Node) ->
 mgr_user_load_mib(Node, Mib) ->
     rcall(Node, snmp_manager_user, load_mib, [Mib]).
 
-mgr_user_sync_get2(Node, TargetName, Oids) when is_list(TargetName) ->
-    mgr_user_sync_get2(Node, TargetName, Oids, []).
+%% mgr_user_sync_get2(Node, TargetName, Oids) when is_list(TargetName) ->
+%%     mgr_user_sync_get2(Node, TargetName, Oids, []).
 
 mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_get2, [TargetName, Oids, SendOpts]).
diff --git a/lib/snmp/test/snmp_manager_user_SUITE.erl b/lib/snmp/test/snmp_manager_user_SUITE.erl
index bad746b29a..04a75232b7 100644
--- a/lib/snmp/test/snmp_manager_user_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_user_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -195,6 +195,11 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 
     snmp_test_global_sys_monitor:reset_events(),
     
+    ?IPRINT("init_per_testcase -> ensure (snmp) manager not running"),
+    Mod      = snmpm_supervisor,
+    Stopper = fun() -> Mod:stop() end,
+    ?ENSURE_NOT_RUNNING(Mod, Stopper, 1000),
+
     SuiteTopDir = ?config(snmp_suite_top_dir, Config),
     CaseTopDir  = filename:join(SuiteTopDir, atom_to_list(Case)),
     ?line ok    = file:make_dir(CaseTopDir),
@@ -1291,7 +1296,7 @@ which_agents() ->
 
 
 write_manager_conf(Dir) ->
-    Port = "5000",
+    Port = "0",
     MMS  = "484",
     EngineID = "\"mgrEngine\"",
     Str = lists:flatten(
-- 
2.31.1

Places

File 1562-snmp-manager-test-Use-port-0-zero-instead-of-5000.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places