C2s/merge master #3935

chrzaszcz · 2023-01-23T13:13:06Z

Merge master to feature/mongoose_c2s. Resolved some type-related conflicts without any functional changes.

Disable making a comment to a summary PR

Fix query that creates inbox and mam delete domain statement

It needs mod_shared_roster, bring it back once mod_shared_roster is back

Previously, disco was tested only for one type of host; now it's tested for real and virtual hosts.

Set cookie to mongooseim The default cookie should be the same as the app name.

Disco test for push notifications

More detailed type for mongoose_tls:tls_socket()

Fix unknown types in dialyzer Proposed changes include: * Fix types * Fix typos * Best to just go and check diff - a lot of tiny changes. * Also forked nksip to fix an unknown type there nkservice:id().

mongoose-im · 2023-01-23T13:23:52Z

small_tests_24 / small_tests / 2e1764c
Reports root / small

small_tests_25 / small_tests / 2e1764c
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 2e1764c
Reports root/ big
OK: 2139 / Failed: 0 / User-skipped: 803 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 2e1764c
Reports root/ big
OK: 2139 / Failed: 0 / User-skipped: 803 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 2e1764c
Reports root/ big
OK: 4163 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 2e1764c
Reports root/ big
OK: 4447 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 2e1764c
Reports root/ big
OK: 4137 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 2e1764c
Reports root/ big
OK: 4155 / Failed: 5 / User-skipped: 91 / 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,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12782.1>,
          [{event_manager,<0.12762.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_max_queries_can_fetch_ahead_1482">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12762.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_max_queries_can_fetch_ahead_1482">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_max_queries_can_fetch_ahead_1482">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_max_queries_can_fetch_ahead_1482">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"d996f783d7eb2b45">>}]},
        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.12780.1>,
          [{event_manager,<0.12727.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_can_paginate_forwards_1477">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12727.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_can_paginate_forwards_1477">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_can_paginate_forwards_1477">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_can_paginate_forwards_1477">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"ac15c941f9b189c5">>}]},
        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

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.12781.1>,
          [{event_manager,<0.12734.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_pagination_overrides_form_1478">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12734.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_pagination_overrides_form_1478">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_pagination_overrides_form_1478">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_pagination_overrides_form_1478">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"7e57f97091a53209">>}]},
        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:max_queries_can_be_limited

{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12783.1>,
          [{event_manager,<0.12755.1>},
           {server,<<"domain.example.com">>},
           {username,<<"kate_max_queries_can_be_limited_1481">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12755.1>},
            {server,<<"domain.example.com">>},
            {username,<<"kate_max_queries_can_be_limited_1481">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"kate_max_queries_can_be_limited_1481">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"kate_max_queries_can_be_limited_1481">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"makrowe;p">>},
           {stream_id,<<"371dcafbd9cf4cbb">>}]},
        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_backwards

{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"[email protected]/res1">>,
          escalus_tcp,<0.12784.1>,
          [{event_manager,<0.12748.1>},
           {server,<<"domain.example.com">>},
           {username,<<"mike_can_paginate_backwards_1480">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12748.1>},
            {server,<<"domain.example.com">>},
            {username,<<"mike_can_paginate_backwards_1480">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"mike_can_paginate_backwards_1480">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"mike_can_paginate_backwards_1480">>},
           {server,<<"domain.example.com">>},
           {host,<<"localhost">>},
           {password,<<"nicniema">>},
           {stream_id,<<"648619f30735200c">>}]},
        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...

Report log

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 2e1764c
Reports root/ big
OK: 4163 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 2e1764c
Reports root/ big
OK: 2306 / Failed: 2 / User-skipped: 662 / Auto-skipped: 0

pubsub_SUITE:dag+basic:publish_only_retract_items_scope_test

{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_and_check_response,4,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,471}]},
     {pubsub_SUITE,'-publish_only_retract_items_scope_test/1-fun-0-',2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_SUITE.erl"},
            {line,723}]},
     {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

pubsub_SUITE:tree+node_config:disable_notifications_test

{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_and_check_response,4,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,471}]},
     {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

riak_mnesia_24 / riak_mnesia / 2e1764c
Reports root/ big
OK: 2477 / Failed: 0 / User-skipped: 634 / Auto-skipped: 0

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 2e1764c
Reports root/ big
OK: 2639 / Failed: 0 / User-skipped: 642 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 2e1764c
Reports root/ big
OK: 4447 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 2e1764c
Reports root/ big
OK: 4444 / Failed: 0 / User-skipped: 100 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 2e1764c
Reports root/ big
OK: 4433 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 2e1764c
Reports root/ big
OK: 4160 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

codecov · 2023-01-23T13:25:10Z

Codecov Report

Base: 82.11% // Head: 82.15% // Increases project coverage by +0.04% 🎉

Coverage data is based on head (08a6e5e) compared to base (1424476).
Patch coverage: 69.81% of modified lines in pull request are covered.

Additional details and impacted files

@@                   Coverage Diff                    @@
##           feature/mongoose_c2s    #3935      +/-   ##
========================================================
+ Coverage                 82.11%   82.15%   +0.04%     
========================================================
  Files                       540      539       -1     
  Lines                     34198    34202       +4     
========================================================
+ Hits                      28082    28099      +17     
+ Misses                     6116     6103      -13

Impacted Files	Coverage Δ
src/admin_extra/service_admin_extra_sessions.erl	`97.05% <ø> (ø)`
src/async_pools/mongoose_async_pools.erl	`92.30% <ø> (ø)`
src/auth/ejabberd_auth_anonymous.erl	`68.85% <ø> (ø)`
src/auth/ejabberd_auth_http.erl	`75.24% <ø> (ø)`
src/auth/ejabberd_auth_rdbms.erl	`57.83% <ø> (ø)`
src/auth/mongoose_gen_auth.erl	`85.36% <ø> (ø)`
src/cassandra/mongoose_cassandra.erl	`81.48% <ø> (ø)`
src/domain/mongoose_lazy_routing.erl	`84.84% <ø> (ø)`
src/ejabberd_router.erl	`78.57% <ø> (ø)`
src/ejabberd_s2s.erl	`82.12% <ø> (ø)`
... and 74 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.

mongoose-im · 2023-01-23T15:40:10Z

small_tests_24 / small_tests / 08a6e5e
Reports root / small

small_tests_25 / small_tests / 08a6e5e
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 08a6e5e
Reports root/ big
OK: 2139 / Failed: 0 / User-skipped: 803 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 08a6e5e
Reports root/ big
OK: 4163 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 08a6e5e
Reports root/ big
OK: 2139 / Failed: 0 / User-skipped: 803 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 08a6e5e
Reports root/ big
OK: 4161 / Failed: 2 / User-skipped: 88 / Auto-skipped: 0

graphql_server_SUITE:admin_http:clustering_http_tests:remove_node_test

{error,{{badmatch,{error,econnrefused}},
    [{rest_helper,fusco_request,7,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,185}]},
     {rest_helper,make_request,1,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,114}]},
     {rest_helper,make_request,1,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,121}]},
     {graphql_server_SUITE,remove_node_test,1,
                 [{file,"/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
                {line,210}]},
     {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

graphql_server_SUITE:admin_http:clustering_http_tests:stop_node_test

{error,{{badmatch,{error,econnrefused}},
    [{rest_helper,fusco_request,7,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,185}]},
     {rest_helper,make_request,1,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,114}]},
     {rest_helper,make_request,1,
            [{file,"/home/circleci/project/big_tests/tests/rest_helper.erl"},
             {line,121}]},
     {graphql_server_SUITE,stop_node_test,1,
                 [{file,"/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
                {line,215}]},
     {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

dynamic_domains_mysql_redis_25 / mysql_redis / 08a6e5e
Reports root/ big
OK: 4137 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 08a6e5e
Reports root/ big
OK: 4160 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 08a6e5e
Reports root/ big
OK: 4447 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 08a6e5e
Reports root/ big
OK: 2639 / Failed: 0 / User-skipped: 642 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 08a6e5e
Reports root/ big
OK: 2281 / Failed: 0 / User-skipped: 661 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 08a6e5e
Reports root/ big
OK: 4447 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 08a6e5e
Reports root/ big
OK: 4433 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 08a6e5e
Reports root/ big
OK: 4444 / Failed: 0 / User-skipped: 100 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 08a6e5e
Reports root/ big
OK: 2477 / Failed: 0 / User-skipped: 634 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 08a6e5e
Reports root/ big
OK: 4163 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0

arcusfelis and others added 20 commits January 9, 2023 11:26

Disable making a comment to a summary PR

c7af26b

Merge pull request #3923 from esl/mu-disable-summary-comment-to-issue

759b64a

Disable making a comment to a summary PR

Fix query that creates inbox delete domain statements

11b9377

Fix query that creates mam muc delete domain statements

bd4708d

Fix query that creates mam pm delete domain statements

68aeff8

Incremental removal is not really supported for mssql

42a246d

Fail to start on MSSQL with delete_domain_limit

e658b06

Merge pull request #3924 from esl/inbox/incremental_domain_removal

8275095

Fix query that creates inbox and mam delete domain statement

Remove service_admin_extra_srg

611609e

It needs mod_shared_roster, bring it back once mod_shared_roster is back

Fix dialyzer unknown calls

917e86d

Fix dialyzer errors in mod_inbox_entries:form_to_query/3 function

dc31adf

Set cookie to mongooseim

24b3822

Fix typo in documentation

944ba98

Disco test for push notifications

af62463

Previously, disco was tested only for one type of host; now it's tested for real and virtual hosts.

Merge pull request #3930 from esl/set-cookie

73c2409

Set cookie to mongooseim The default cookie should be the same as the app name.

Merge pull request #3926 from esl/disco-tests-push-notifications

ef6be9a

Disco test for push notifications

Address review comments

f20a7bc

More detailed type for mongoose_tls:tls_socket()

Remove gdpr:domain() type

61a6061

Merge pull request #3929 from esl/mu-fix-unknown-types

dda03c1

Fix unknown types in dialyzer Proposed changes include: * Fix types * Fix typos * Best to just go and check diff - a lot of tiny changes. * Also forked nksip to fix an unknown type there nkservice:id().

Merge branch 'master' into feature/mongoose_c2s

2e1764c

chrzaszcz added the mongoose_c2s label Jan 23, 2023

chrzaszcz changed the base branch from master to feature/mongoose_c2s January 23, 2023 13:13

chrzaszcz force-pushed the c2s/merge-master branch 4 times, most recently from 4b5c563 to 5e2a04a Compare January 23, 2023 15:30

Switch from medium to medium+ because dialyzer went out of memory

08a6e5e

chrzaszcz force-pushed the c2s/merge-master branch from 5e2a04a to 08a6e5e Compare January 23, 2023 15:31

chrzaszcz marked this pull request as ready for review January 23, 2023 16:19

NelsonVides approved these changes Jan 23, 2023

View reviewed changes

NelsonVides merged commit 8d3e882 into feature/mongoose_c2s Jan 23, 2023

NelsonVides deleted the c2s/merge-master branch January 23, 2023 17:38

jacekwegr added this to the 6.1.0 milestone Apr 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

C2s/merge master #3935

C2s/merge master #3935

chrzaszcz commented Jan 23, 2023 •

edited

Loading

mongoose-im commented Jan 23, 2023 •

edited

Loading

codecov bot commented Jan 23, 2023 •

edited

Loading

mongoose-im commented Jan 23, 2023 •

edited

Loading

C2s/merge master #3935

C2s/merge master #3935

Conversation

chrzaszcz commented Jan 23, 2023 • edited Loading

mongoose-im commented Jan 23, 2023 • edited Loading

codecov bot commented Jan 23, 2023 • edited Loading

Codecov Report

mongoose-im commented Jan 23, 2023 • edited Loading

chrzaszcz commented Jan 23, 2023 •

edited

Loading

mongoose-im commented Jan 23, 2023 •

edited

Loading

codecov bot commented Jan 23, 2023 •

edited

Loading

mongoose-im commented Jan 23, 2023 •

edited

Loading