Merge pull request #3938 from esl/5.1-deps-update

5.1 deps update

big_tests/tests/push_integration_SUITE.erl

@@ -52,7 +52,7 @@ groups() ->
     G = [
          {pubsub_ful, [], basic_groups()},
          {pubsub_less, [], basic_groups()},
-         {integration_with_sm_and_offline_storage,[parallel],
+         {integration_with_sm_and_offline_storage,[],
           [
            no_duplicates_default_plugin,
            sm_unack_messages_notified_default_plugin
@@ -62,7 +62,7 @@ groups() ->
               immediate_notification,
               double_notification_with_two_sessions_in_resume
           ]},
-         {pm_msg_notifications, [parallel],
+         {pm_msg_notifications, [],
           [
            pm_msg_notify_on_apns_w_high_priority,
            pm_msg_notify_on_fcm_w_high_priority,
@@ -76,7 +76,7 @@ groups() ->
            pm_msg_notify_on_fcm_silent,
            pm_msg_notify_on_apns_w_topic
           ]},
-         {muclight_msg_notifications, [parallel],
+         {muclight_msg_notifications, [],
           [
            muclight_msg_notify_on_apns_w_high_priority,
            muclight_msg_notify_on_fcm_w_high_priority,
@@ -90,22 +90,22 @@ groups() ->
            muclight_msg_notify_on_fcm_silent,
            muclight_msg_notify_on_w_topic
           ]},
-         {groupchat_notifications_with_inbox, [parallel],
+         {groupchat_notifications_with_inbox, [],
           [
            muclight_inbox_msg_unread_count_apns,
            muclight_inbox_msg_unread_count_fcm,
            muclight_aff_change_fcm,
            muclight_aff_change_apns
           ]},
-         {pm_notifications_with_inbox, [parallel],
+         {pm_notifications_with_inbox, [],
           [
            inbox_msg_unread_count_apns,
            inbox_msg_unread_count_fcm,
            inbox_msg_reset_unread_count_apns,
            inbox_msg_reset_unread_count_fcm
           ]},
-         {failure_cases_v3, [parallel], failure_cases()},
-         {failure_cases_v2, [parallel], failure_cases()}
+         {failure_cases_v3, [], failure_cases()},
+         {failure_cases_v2, [], failure_cases()}
         ],
     G.
 
@@ -169,10 +169,22 @@ end_per_group(_, Config) ->
     Config.
 
 init_per_testcase(CaseName, Config) ->
+    %% unfortunately meck:reset(Module) doesn't result
+    %% in 'valid' flag resetting (see meck_proc module),
+    %% so we have to unload existing mocking and mock
+    %% module again before running every test case.
+    catch rpc(?RPC_SPEC, meck, unload, [mod_event_pusher]),
+    rpc(?RPC_SPEC, meck, new, [mod_event_pusher, [no_link, passthrough]]),
     escalus:init_per_testcase(CaseName, Config).
 
 end_per_testcase(CaseName, Config) ->
-    escalus:end_per_testcase(CaseName, Config).
+    Valid = rpc(?RPC_SPEC, meck, validate, [mod_event_pusher]),
+    rpc(?RPC_SPEC, meck, unload, [mod_event_pusher]),
+    escalus:end_per_testcase(CaseName, Config),
+    case Valid of
+        false -> {fail, "mod_event_pusher crashed"};
+        true -> ok
+    end.
 
 %%------------------------------------------------------------------------------------
 %% GROUP integration_with_sm_and_offline_storage & enhanced_integration_with_sm

rebar.config

@@ -107,8 +107,7 @@
 
   %%% Other
   {pa, {git, "https://github.com/erszcz/pa.git", {branch, "master"}}},
-  %% MR of jwerl - https://gitlab.com/glejeune/jwerl/-/merge_requests/13
-  {jwerl, {git, "https://gitlab.com/vkatsuba/jwerl.git", {branch, "refactoring/otp-24"}}},
+  {jwerl, "1.2.0"},
   {cpool, "0.1.0"}, %% Do not upgrade cpool to version 0.1.1, it has bugs
   {nkpacket, {git, "https://github.com/michalwski/nkpacket.git", {ref, "f7c5349"}}},
   {nksip, {git, "https://github.com/NetComposer/nksip.git", {ref, "1a29ef3"}}}

rebar.lock

@@ -12,7 +12,7 @@
  {<<"cpool">>,{pkg,<<"cpool">>,<<"0.1.0">>},0},
  {<<"cqerl">>,
   {git,"https://github.com/esl/cqerl.git",
-       {ref,"c6af697db4b1787e70a96301faa44464ea7459a7"}},
+       {ref,"0b7fa8c8f87306ea1ab88f841af78ca399768a10"}},
   0},
  {<<"credentials_obfuscation">>,
   {pkg,<<"credentials_obfuscation">>,<<"2.4.0">>},
@@ -57,16 +57,13 @@
  {<<"jid">>,{pkg,<<"mongoose_jid">>,<<"2.0.0">>},0},
  {<<"jiffy">>,{pkg,<<"jiffy">>,<<"1.1.1">>},0},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},1},
- {<<"jwerl">>,
-  {git,"https://gitlab.com/vkatsuba/jwerl.git",
-       {ref,"d03607fd14a6a7556f01014af84903a3df60ff5d"}},
-  0},
+ {<<"jwerl">>,{pkg,<<"jwerl">>,<<"1.2.0">>},0},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
  {<<"lasse">>,{pkg,<<"lasse">>,<<"1.2.0">>},0},
  {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.6.2">>},1},
  {<<"luerl">>,
   {git,"https://github.com/rvirding/luerl.git",
-       {ref,"bc655178dc8f59f29199fd7df77a7c314c0f2e02"}},
+       {ref,"5e61c1838d08430af67fb870995b05a41d64aeee"}},
   2},
  {<<"lz4">>,
   {git,"https://github.com/szktty/erlang-lz4.git",
@@ -101,7 +98,7 @@
  {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.0">>},1},
  {<<"pooler">>,{pkg,<<"pooler">>,<<"1.5.3">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
- {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.4">>},1},
+ {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.5">>},1},
  {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.11">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"re2">>,{pkg,<<"re2">>,<<"1.9.7">>},1},
@@ -168,6 +165,7 @@
  {<<"jid">>, <<"0D0FD1130EAD05DF672D1C9E0405D3000F0C87A7D446577755CF5EB173104FE9">>},
  {<<"jiffy">>, <<"ACA10F47AA91697BF24AB9582C74E00E8E95474C7EF9F76D4F1A338D0F5DE21B">>},
  {<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>},
+ {<<"jwerl">>, <<"2A0EC870BE0B803BBEEE1463DC5AE05E3D64EEAE2ABC7DB4250ABC611FE7E320">>},
  {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
  {<<"lasse">>, <<"DB8F06983B235F6C4C86AC79BCF23EDDCA16FCCCAD1EB45F222852BB133BD793">>},
  {<<"lhttpc">>, <<"044F16F0018C7AA7E945E9E9406C7F6035E0B8BC08BF77B00C78CE260E1071E3">>},
@@ -180,7 +178,7 @@
  {<<"parse_trans">>, <<"BB87AC362A03CA674EBB7D9D498F45C03256ADED7214C9101F7035EF44B798C7">>},
  {<<"pooler">>, <<"898CD1FA301FC42D4A8ED598CE139B71CA85B54C16AB161152B5CC5FBDCFA1A8">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
- {<<"quickrand">>, <<"168CA3A8466A26912B8C3A1D6AA58975E1BB49E5C7AFB4998B80F6B90F910490">>},
+ {<<"quickrand">>, <<"06FCAD85CB47D5C85C51D6BC9C84A082501BA098A89D64AD0A2F69599E034C04">>},
  {<<"rabbit_common">>, <<"25DF900B1AEC7357C90253CC4528B43C5FF064F27C8C627707B747AE986EBF77">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"re2">>, <<"8114654E72EF62F605A8A393F219702F253CB7A02F671503918B76D0614DB046">>},
@@ -230,6 +228,7 @@
  {<<"jid">>, <<"7BAE8403552D5BCECD1CD2A848445B5FC3533F5EEB355173A0531A1A1AA8E008">>},
  {<<"jiffy">>, <<"62E1F0581C3C19C33A725C781DFA88410D8BFF1BBAFC3885A2552286B4785C4C">>},
  {<<"jsx">>, <<"8EE1DB1CABAFDD578A2776A6AAAE87C2A8CE54B47B59E9EC7DAB5D7EB71CD8DC">>},
+ {<<"jwerl">>, <<"894C275CA4CF3A4F293541927CA3D7A2622B21D8BD70580EF70EACB0425F1941">>},
  {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
  {<<"lasse">>, <<"8081769683F73D76A718319A593F8551A0D3747404C51CCE5869CFC6AEDC7EDF">>},
  {<<"lhttpc">>, <<"76B5FA6149D1E10D4B1FBC4EBD51D371DB19C1AB9F0A9ECF5B526440DF064E97">>},
@@ -242,7 +241,7 @@
  {<<"parse_trans">>, <<"F99E368830BEA44552224E37E04943A54874F08B8590485DE8D13832B63A2DC3">>},
  {<<"pooler">>, <<"058D85C5081289B90E97E4DDDBC3BB5A3B4A19A728AB3BC88C689EFCC36A07C7">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
- {<<"quickrand">>, <<"4CB18E9304CF28E054E8DC6E151D1AC7F174E6FE31D5C1A07F71279B92A90800">>},
+ {<<"quickrand">>, <<"252CF0493570EBF1A58985CB71990982CDDCD4396B6427F1E10CF58924C1C052">>},
  {<<"rabbit_common">>, <<"1BCAC63760A0BF0E55D7D3C2FF36ED2310E0B560BD110A5A2D602D76D9C08E1A">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"re2">>, <<"FF0703CA095B5BEBF57DD12571AF24B3BA404180E9B5E43128790B5D31EBE803">>},