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

C2s/merge master #3917

Merged
merged 40 commits into from
Jan 4, 2023
Merged

C2s/merge master #3917

merged 40 commits into from
Jan 4, 2023

Conversation

NelsonVides
Copy link
Collaborator

@NelsonVides NelsonVides commented Jan 4, 2023

Just merge the latest master, which includes fixes to sasl_external, and the docs job

jacekwegr and others added 30 commits December 9, 2022 12:43
Added info about GraphQL to main page and user guide
The goal is to add the 'cth_surefire' hook, which will collect test
results for CircleCI Insights.
The Insights need results in the JUnit XML format.
This is achieved by using the 'cth_surefire' hook.
- Support parallel test failures
- Close groups when end_per_suite is skipped or fails
- Include group name in error messages
Fix common test error handling in cth_surefire
[merge after #3907] Test with OTP 25.2
It happens that handler to extend inbox entries want to fetch extra data for each entry, so if the
hook is ran per message, the handler will have to make an extra query for each message, potentially
incurring into way too many round trips to the DB. Instead, we can pass the whole buffer to the
handler, so that the handler is able to aggregate as best as possible all the entries.
NelsonVides and others added 9 commits January 2, 2023 11:11
Remove list with headings in mod_vcard.md
Previously missing keys or values would be reported as 'undefined',
which could result in a crash (Mnesia) or would be silently converted
to binaries (RDBMS).
Refactored handlers to follow stop convention
@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Jan 4, 2023

Codecov Report

Base: 73.22% // Head: 73.23% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (c9141e3) compared to base (025f2a7).
Patch coverage: 75.58% of modified lines in pull request are covered.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           feature/mongoose_c2s    #3917   +/-   ##
=====================================================
  Coverage                 73.22%   73.23%           
=====================================================
  Files                       540      540           
  Lines                     34187    34191    +4     
=====================================================
+ Hits                      25035    25041    +6     
+ Misses                     9152     9150    -2     
Impacted Files Coverage Δ
src/ejabberd_admin.erl 37.14% <ø> (ø)
src/ejabberd_commands.erl 28.37% <ø> (ø)
.../event_pusher/mod_event_pusher_hook_translator.erl 82.85% <ø> (+2.30%) ⬆️
src/event_pusher/mod_event_pusher_push.erl 20.00% <0.00%> (-0.84%) ⬇️
src/global_distrib/mod_global_distrib.erl 27.83% <0.00%> (-0.29%) ⬇️
src/global_distrib/mod_global_distrib_bounce.erl 30.66% <0.00%> (+0.79%) ⬆️
src/inbox/mod_inbox_rdbms.erl 88.52% <ø> (ø)
src/mam/mod_mam_muc.erl 74.88% <ø> (ø)
src/mam/mod_mam_pm.erl 88.40% <ø> (+0.35%) ⬆️
src/mnesia_api.erl 77.34% <76.19%> (+2.72%) ⬆️
... and 17 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.

@NelsonVides NelsonVides changed the base branch from c2s/enable_suites to feature/mongoose_c2s January 4, 2023 12:56
@NelsonVides NelsonVides marked this pull request as ready for review January 4, 2023 12:58
@mongoose-im
Copy link
Collaborator

mongoose-im commented Jan 4, 2023

small_tests_24 / small_tests / c9141e3
Reports root / small


small_tests_25 / small_tests / c9141e3
Reports root / small


ldap_mnesia_24 / ldap_mnesia / c9141e3
Reports root/ big
OK: 1761 / Failed: 0 / User-skipped: 797 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / c9141e3
Reports root/ big
OK: 3895 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / c9141e3
Reports root/ big
OK: 1761 / Failed: 0 / User-skipped: 797 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / c9141e3
Reports root/ big
OK: 4071 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / c9141e3
Reports root/ big
OK: 3869 / Failed: 0 / User-skipped: 104 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / c9141e3
Reports root/ big
OK: 1913 / Failed: 0 / User-skipped: 645 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / c9141e3
Reports root/ big
OK: 2265 / Failed: 0 / User-skipped: 632 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / c9141e3
Reports root/ big
OK: 3895 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / c9141e3
Reports root/ big
OK: 2103 / Failed: 0 / User-skipped: 624 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / c9141e3
Reports root/ big
OK: 4057 / Failed: 0 / User-skipped: 103 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / c9141e3
Reports root/ big
OK: 3890 / Failed: 5 / User-skipped: 78 / Auto-skipped: 0

inbox_extensions_SUITE:regular:one_to_one:pagination:can_paginate_backwards
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12497.1>,
          [{event_manager,<0.12468.1>},
           {server,<<"domain.example.com">>},
           {username,<<"bOb_can_paginate_backwards_1514">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12468.1>},
            {server,<<"domain.example.com">>},
            {username,<<"bOb_can_paginate_backwards_1514">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_can_paginate_backwards_1514">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_can_paginate_backwards_1514">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"15ec8117877ca95f">>}]},
        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...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12496.1>,
          [{event_manager,<0.12475.1>},
           {server,<<"domain.example.com">>},
           {username,<<"bOb_pagination_overrides_form_1515">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12475.1>},
            {server,<<"domain.example.com">>},
            {username,<<"bOb_pagination_overrides_form_1515">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_pagination_overrides_form_1515">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_pagination_overrides_form_1515">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"9efb2bd103e38f03">>}]},
        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_e...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12494.1>,
          [{event_manager,<0.12454.1>},
           {server,<<"domain.example.com">>},
           {username,<<"bOb_can_paginate_forwards_1512">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12454.1>},
            {server,<<"domain.example.com">>},
            {username,<<"bOb_can_paginate_forwards_1512">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_can_paginate_forwards_1512">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_can_paginate_forwards_1512">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"a23a4c1faed5aa1c">>}]},
        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,'-ca...

Report log

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12498.1>,
          [{event_manager,<0.12482.1>},
           {server,<<"domain.example.com">>},
           {username,<<"bOb_max_queries_can_fetch_ahead_1516">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12482.1>},
            {server,<<"domain.example.com">>},
            {username,<<"bOb_max_queries_can_fetch_ahead_1516">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_max_queries_can_fetch_ahead_1516">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_max_queries_can_fetch_ahead_1516">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"3cfe173cf6ee3720">>}]},
        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}]},
   ...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12499.1>,
          [{event_manager,<0.12461.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_max_queries_can_be_limited_1513">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12461.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_max_queries_can_be_limited_1513">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_max_queries_can_be_limited_1513">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_max_queries_can_be_limited_1513">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"2b98d47cd3de333b">>}]},
        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}]},
 ...

Report log


mssql_mnesia_25 / odbc_mssql_mnesia / c9141e3
Reports root/ big
OK: 4071 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / c9141e3
Reports root/ big
OK: 4071 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / c9141e3
Reports root/ big
OK: 3890 / Failed: 5 / User-skipped: 78 / Auto-skipped: 0

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12581.1>,
          [{event_manager,<0.12558.1>},
           {server,<<"domain.example.com">>},
           {username,<<"bOb_max_queries_can_be_limited_1515">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12558.1>},
            {server,<<"domain.example.com">>},
            {username,<<"bOb_max_queries_can_be_limited_1515">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"bob_max_queries_can_be_limited_1515">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"bOb_max_queries_can_be_limited_1515">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrolika">>},
           {stream_id,<<"446ca090a325b60d">>}]},
        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}]},
     {in...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12582.1>,
          [{event_manager,<0.12551.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_can_paginate_backwards_1514">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12551.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_can_paginate_backwards_1514">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_can_paginate_backwards_1514">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_can_paginate_backwards_1514">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"001f83fc77fffcc9">>}]},
        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_extension...

Report log

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12585.1>,
          [{event_manager,<0.12565.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_max_queries_can_fetch_ahead_1516">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12565.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_max_queries_can_fetch_ahead_1516">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_max_queries_can_fetch_ahead_1516">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_max_queries_can_fetch_ahead_1516">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"c1f95fc918971a57">>}]},
        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}...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12583.1>,
          [{event_manager,<0.12544.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_pagination_overrides_form_1513">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12544.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_pagination_overrides_form_1513">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_pagination_overrides_form_1513">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_pagination_overrides_form_1513">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"741c79f144f53f65">>}]},
        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}]},
     {...

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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12584.1>,
          [{event_manager,<0.12537.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_can_paginate_forwards_1512">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12537.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_can_paginate_forwards_1512">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_can_paginate_forwards_1512">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_can_paginate_forwards_1512">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"aecf01f49c6f5d2e">>}]},
        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_SUI...

Report log


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / c9141e3
Reports root/ big
OK: 3895 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

Copy link
Member

@chrzaszcz chrzaszcz 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

@chrzaszcz chrzaszcz merged commit f5d1338 into feature/mongoose_c2s Jan 4, 2023
@chrzaszcz chrzaszcz deleted the c2s/merge_master branch January 4, 2023 15:56
@jacekwegr jacekwegr added this to the 6.1.0 milestone Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants