snmp: Add crypto precondition test

2 files changed, 43 insertions, 14 deletions

diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 3c1a6f2afd..2ed2c4580c 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -605,7 +605,12 @@ init_per_group(multiple_reqs_3 = GroupName, Config) ->
 init_per_group(test_multi_threaded = GroupName, Config) -> 
     init_mt(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(test_v3 = GroupName, Config) -> 
-    init_v3(snmp_test_lib:init_group_top_dir(GroupName, Config));
+    case snmp_test_lib:crypto_start() of
+        ok ->
+            init_v3(snmp_test_lib:init_group_top_dir(GroupName, Config));
+        _ ->
+            {skip, "Crypto did not start"}
+    end;
 init_per_group(test_v1_v2 = GroupName, Config) -> 
     init_v1_v2(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(test_v2 = GroupName, Config) -> 
@@ -631,11 +636,26 @@ init_per_group(mib_storage_varm_dets = GroupName, Config) ->
     init_varm_mib_storage_dets(
       snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(mib_storage_size_check_mnesia = GroupName, Config) -> 
-    init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+       case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_size_check_dets = GroupName, Config) -> 
-    init_size_check_msd(snmp_test_lib:init_group_top_dir(GroupName, Config));
+       case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_size_check_ets = GroupName, Config) -> 
-    init_size_check_mse(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           case snmp_test_lib:crypto_start() of
+           ok ->
+               init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
+           _ ->
+               {skip, "Crypto did not start"}
+       end;
 init_per_group(mib_storage_mnesia = GroupName, Config) -> 
     init_mib_storage_mnesia(snmp_test_lib:init_group_top_dir(GroupName, 
 							     Config));
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 4bfeb0f8d1..6ced55f0cc 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -156,16 +156,25 @@ init_per_suite(Config0) when is_list(Config0) ->
     ?DBG("init_per_suite -> entry with"
 	 "~n   Config0: ~p", [Config0]),
 
-    Config1   = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), 
-    Config2   = snmp_test_lib:fix_data_dir(Config1),
-
-    %% Mib-dirs
-    %% data_dir is trashed by the test-server / common-test
-    %% so there is no point in fixing it...
-    MibDir    = snmp_test_lib:lookup(data_dir, Config2),
-    StdMibDir = filename:join([code:priv_dir(snmp), "mibs"]),
-
-    [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2].
+    %% Preferably this test SUITE should be divided into groups
+    %% so that if crypto does not work only v3 tests that
+    %% need crypto will be skipped, but as this is only a
+    %% problem with one legacy test machine, we will procrastinate
+    %% until we have a more important reason to fix this. 
+    case snmp_test_lib:crypto_start() of
+        ok ->
+            Config1   = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), 
+            Config2   = snmp_test_lib:fix_data_dir(Config1),
+            %% Mib-dirs
+            %% data_dir is trashed by the test-server / common-test
+            %% so there is no point in fixing it...
+            MibDir    = snmp_test_lib:lookup(data_dir, Config2),
+            StdMibDir = filename:join([code:priv_dir(snmp), "mibs"]),
+            
+            [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2];
+        _ ->
+            {skip, "Crypto did not start"}
+    end.
 
 end_per_suite(Config) when is_list(Config) ->