diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-31 08:38:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-31 08:38:11 +0100 |
| commit | 7c2691ef183e987563350b6e25b5eb62770991ea (patch) | |
| tree | eab78f9fc5e25bfe266b7635d7f187f606ee222f /lib/snmp/test/snmp_agent_test.erl | |
| parent | d998d08c964804d9facd7b05c8429fcb8fab7f59 (diff) | |
| parent | d4f61c4e26005740388668f3773871f043366342 (diff) | |
| download | otp-7c2691ef183e987563350b6e25b5eb62770991ea.tar.gz otp-7c2691ef183e987563350b6e25b5eb62770991ea.tar.bz2 otp-7c2691ef183e987563350b6e25b5eb62770991ea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/snmp/test/snmp_agent_test.erl')
| -rw-r--r-- | lib/snmp/test/snmp_agent_test.erl | 28 |
1 files changed, 24 insertions, 4 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)); |