Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored hook handlers in mod_shared_roster_ldap #3874

Merged
merged 1 commit into from
Nov 25, 2022

Conversation

pawlooss1
Copy link
Member

This PR changes all hook handlers in mod_shared_roster_ldap module to gen_hook format.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 24, 2022

small_tests_24 / small_tests / 6ffea97
Reports root / small


small_tests_25 / small_tests / 6ffea97
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 6ffea97
Reports root/ big
OK: 4098 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 6ffea97
Reports root/ big
OK: 2155 / Failed: 0 / User-skipped: 812 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 6ffea97
Reports root/ big
OK: 4072 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 6ffea97
Reports root/ big
OK: 2155 / Failed: 0 / User-skipped: 812 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 6ffea97
Reports root/ big
OK: 4098 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 6ffea97
Reports root/ big
OK: 4472 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 6ffea97
Reports root/ big
OK: 2297 / Failed: 0 / User-skipped: 670 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 6ffea97
Reports root/ big
OK: 2643 / Failed: 0 / User-skipped: 663 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 6ffea97
Reports root/ big
OK: 4472 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 6ffea97
Reports root/ big
OK: 2487 / Failed: 0 / User-skipped: 649 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 6ffea97
Reports root/ big
OK: 4458 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 6ffea97
Reports root/ big
OK: 4467 / Failed: 5 / User-skipped: 97 / Auto-skipped: 0

inbox_extensions_SUITE:regular:one_to_one:pagination:max_queries_can_fetch_ahead
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"bob_max_queries_can_fetch_ahead_1518@localhost/res1">>,
          escalus_tcp,<0.8683.1>,
          [{event_manager,<0.8672.1>},
           {server,<<"localhost">>},
           {username,<<"bOb_max_queries_can_fetch_ahead_1518">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8672.1>},
            {server,<<"localhost">>},
            {username,<<"bOb_max_queries_can_fetch_ahead_1518">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_max_queries_can_fetch_ahead_1518">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_max_queries_can_fetch_ahead_1518">>},
           {server,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"5fa110822e061fd6">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {inbox_helper,'-given_conversations_between/2-fun-1-',4,
       [{file,"/home/circleci/project/big_tests/tests/inbox_helper.erl"},
        {line,543}]},
     {lists,foldl,3,[{file,"lists.erl"},{line,1350}]},
     {inbox_extensions_SUITE,'-max_queries_can_fetch_ahead/1-fun-0-',4,
       [{file,...

Report log

inbox_extensions_SUITE:regular:one_to_one:pagination:pagination_overrides_form
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"kate_pagination_overrides_form_1514@localhost/res1">>,
          escalus_tcp,<0.8684.1>,
          [{event_manager,<0.8644.1>},
           {server,<<"localhost">>},
           {username,<<"kate_pagination_overrides_form_1514">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8644.1>},
            {server,<<"localhost">>},
            {username,<<"kate_pagination_overrides_form_1514">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_pagination_overrides_form_1514">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_pagination_overrides_form_1514">>},
           {server,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"d253ecb7a482a259">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {inbox_helper,'-given_conversations_between/2-fun-1-',4,
       [{file,"/home/circleci/project/big_tests/tests/inbox_helper.erl"},
        {line,543}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {inbox_extensions_SUITE,'-pagination_overrides_form/1-fun-0-',4,
       [{file,
    ...

Report log

inbox_extensions_SUITE:regular:one_to_one:pagination:can_paginate_forwards
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"kate_can_paginate_forwards_1515@localhost/res1">>,
          escalus_tcp,<0.8686.1>,
          [{event_manager,<0.8651.1>},
           {server,<<"localhost">>},
           {username,<<"kate_can_paginate_forwards_1515">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8651.1>},
            {server,<<"localhost">>},
            {username,<<"kate_can_paginate_forwards_1515">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_can_paginate_forwards_1515">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_can_paginate_forwards_1515">>},
           {server,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"c711828f7ab03613">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {inbox_helper,'-given_conversations_between/2-fun-1-',4,
       [{file,"/home/circleci/project/big_tests/tests/inbox_helper.erl"},
        {line,543}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {inbox_extensions_SUITE,'-can_paginate_forwards/1-fun-0-',4,
       [{file,
          "/home/circleci/project/big_t...

Report log

inbox_extensions_SUITE:regular:one_to_one:pagination:can_paginate_backwards
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"kate_can_paginate_backwards_1517@localhost/res1">>,
          escalus_tcp,<0.8687.1>,
          [{event_manager,<0.8665.1>},
           {server,<<"localhost">>},
           {username,<<"kate_can_paginate_backwards_1517">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8665.1>},
            {server,<<"localhost">>},
            {username,<<"kate_can_paginate_backwards_1517">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_can_paginate_backwards_1517">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_can_paginate_backwards_1517">>},
           {server,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"debf29cf5c6296e9">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {inbox_helper,'-given_conversations_between/2-fun-1-',4,
       [{file,"/home/circleci/project/big_tests/tests/inbox_helper.erl"},
        {line,543}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {inbox_extensions_SUITE,'-can_paginate_backwards/1-fun-0-',4,
       [{file,
          "/home/circleci/project...

Report log

inbox_extensions_SUITE:regular:one_to_one:pagination:max_queries_can_be_limited
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"kate_max_queries_can_be_limited_1516@localhost/res1">>,
          escalus_tcp,<0.8685.1>,
          [{event_manager,<0.8658.1>},
           {server,<<"localhost">>},
           {username,<<"kate_max_queries_can_be_limited_1516">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8658.1>},
            {server,<<"localhost">>},
            {username,<<"kate_max_queries_can_be_limited_1516">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_max_queries_can_be_limited_1516">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_max_queries_can_be_limited_1516">>},
           {server,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"b012c8652e67d0c8">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {inbox_helper,'-given_conversations_between/2-fun-1-',4,
       [{file,"/home/circleci/project/big_tests/tests/inbox_helper.erl"},
        {line,543}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {inbox_extensions_SUITE,'-max_queries_can_be_limited/1-fun-0-',4,
       [{file...

Report log


mssql_mnesia_25 / odbc_mssql_mnesia / 6ffea97
Reports root/ big
OK: 4483 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_2655@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_2655@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"kK24ra8/bg3jqOUtERxd9w==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1291}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1223}]}]}}

Report log

@codecov
Copy link

codecov bot commented Nov 24, 2022

Codecov Report

Base: 83.09% // Head: 83.13% // Increases project coverage by +0.03% 🎉

Coverage data is based on head (6ffea97) compared to base (d5abdd6).
Patch coverage: 70.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3874      +/-   ##
==========================================
+ Coverage   83.09%   83.13%   +0.03%     
==========================================
  Files         535      535              
  Lines       34168    34169       +1     
==========================================
+ Hits        28393    28405      +12     
+ Misses       5775     5764      -11     
Impacted Files Coverage Δ
src/mod_shared_roster_ldap.erl 60.30% <45.45%> (-2.38%) ⬇️
src/mongoose_hooks.erl 95.97% <100.00%> (+0.07%) ⬆️
src/ejabberd_c2s.erl 88.95% <0.00%> (-0.30%) ⬇️
src/mod_muc_log.erl 62.82% <0.00%> (ø)
src/pubsub/mod_pubsub_db_rdbms.erl 95.34% <0.00%> (+0.25%) ⬆️
src/mod_muc_room.erl 78.68% <0.00%> (+0.28%) ⬆️
src/ejabberd_service.erl 67.53% <0.00%> (+0.64%) ⬆️
src/ejabberd_s2s_out.erl 63.27% <0.00%> (+0.74%) ⬆️
src/rdbms/mongoose_rdbms.erl 66.31% <0.00%> (+1.05%) ⬆️
src/auth/ejabberd_auth.erl 84.77% <0.00%> (+1.52%) ⬆️
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@pawlooss1 pawlooss1 marked this pull request as ready for review November 24, 2022 12:53
Copy link

@kamilwaz kamilwaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍

@pawlooss1 pawlooss1 merged commit 6d01f46 into master Nov 25, 2022
@pawlooss1 pawlooss1 deleted the hooks/mod_shared_roster_ldap branch November 25, 2022 08:44
@chrzaszcz chrzaszcz added this to the 6.0.0 milestone Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants