Put mod_roster config options in a map with defaults #3569

gustawlippa · 2022-03-03T10:20:25Z

Normal stuff + some clean up in comments and specs.

codecov · 2022-03-03T10:30:57Z

Codecov Report

Merging #3569 (429ebac) into master (88fc9c1) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3569      +/-   ##
==========================================
+ Coverage   81.05%   81.09%   +0.03%     
==========================================
  Files         421      421              
  Lines       32205    32205              
==========================================
+ Hits        26105    26116      +11     
+ Misses       6100     6089      -11

Impacted Files	Coverage Δ
src/gen_mod.erl	`79.46% <ø> (ø)`
src/mod_roster_backend.erl	`96.42% <ø> (ø)`
src/mod_roster_mnesia.erl	`93.93% <ø> (ø)`
src/mod_roster_rdbms.erl	`96.15% <ø> (ø)`
src/mod_roster.erl	`78.75% <100.00%> (ø)`
src/mod_roster_riak.erl	`96.92% <100.00%> (ø)`
src/mam/mod_mam_rdbms_arch_async.erl	`87.35% <0.00%> (-1.15%)`	⬇️
src/domain/mongoose_domain_loader.erl	`89.28% <0.00%> (-0.90%)`	⬇️
src/pubsub/mod_pubsub.erl	`73.13% <0.00%> (-0.06%)`	⬇️
src/mod_muc_log.erl	`78.11% <0.00%> (ø)`
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 88fc9c1...429ebac. Read the comment docs.

mongoose-im · 2022-03-03T13:21:07Z

small_tests_24 / small_tests / bbe59e2
Reports root / small

small_tests_23 / small_tests / bbe59e2
Reports root / small

dynamic_domains_mysql_redis_24 / mysql_redis / bbe59e2
Reports root/ big
OK: 2661 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / bbe59e2
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / bbe59e2
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / bbe59e2
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / bbe59e2
Reports root/ big
OK: 1504 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / bbe59e2
Reports root/ big
OK: 1515 / Failed: 1 / User-skipped: 398 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription

{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_830@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_830@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"aXQhXWsIELGXp9ciA3Jw5g==">>}],
            [{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,1754}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1263}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1195}]}]}}

Report log

internal_mnesia_24 / internal_mnesia / bbe59e2
Reports root/ big
OK: 1545 / Failed: 0 / User-skipped: 357 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / bbe59e2
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / bbe59e2
Reports root/ big
OK: 3047 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / bbe59e2
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / bbe59e2
Reports root/ big
OK: 1846 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / bbe59e2
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / bbe59e2
Reports root/ big
OK: 1691 / Failed: 1 / User-skipped: 364 / Auto-skipped: 0

gdpr_SUITE:remove_personal_data:remove_roster

{error,{{assertion_failed,assert_many,false,[is_roster_set],[],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {escalus_story,'-make_all_clients_friends/1-fun-0-',2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,108}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
     {escalus_utils,distinct_pairs,2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,60}]},
     {escalus_story,make_all_clients_friends,1,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,106}]}]}}

Report log

mongoose-im · 2022-03-03T14:10:49Z

small_tests_23 / small_tests / fcc214b
Reports root / small

small_tests_24 / small_tests / fcc214b
Reports root / small

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / fcc214b
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / fcc214b
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mysql_redis_24 / mysql_redis / fcc214b
Reports root/ big
OK: 2661 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / fcc214b
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / fcc214b
Reports root/ big
OK: 1504 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / fcc214b
Reports root/ big
OK: 1504 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / fcc214b
Reports root/ big
OK: 1545 / Failed: 0 / User-skipped: 357 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / fcc214b
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / fcc214b
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / fcc214b
Reports root/ big
OK: 1846 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / fcc214b
Reports root/ big
OK: 3047 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / fcc214b
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / fcc214b
Reports root/ big
OK: 1692 / Failed: 0 / User-skipped: 364 / Auto-skipped: 0

chrzaszcz

Looks good, nice to see improvements in various modules, I added one comment.

test/config_parser_SUITE.erl

mongoose-im · 2022-03-04T11:34:54Z

small_tests_24 / small_tests / 429ebac
Reports root / small

small_tests_23 / small_tests / 429ebac
Reports root / small

dynamic_domains_mysql_redis_24 / mysql_redis / 429ebac
Reports root/ big
OK: 2661 / Failed: 0 / User-skipped: 150 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 429ebac
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 429ebac
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 429ebac
Reports root/ big
OK: 2678 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 429ebac
Reports root/ big
OK: 1504 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 429ebac
Reports root/ big
OK: 1504 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / 429ebac
Reports root/ big
OK: 1545 / Failed: 0 / User-skipped: 357 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 429ebac
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 429ebac
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 429ebac
Reports root/ big
OK: 1846 / Failed: 0 / User-skipped: 365 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 429ebac
Reports root/ big
OK: 3047 / Failed: 0 / User-skipped: 147 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 429ebac
Reports root/ big
OK: 3052 / Failed: 0 / User-skipped: 142 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 429ebac
Reports root/ big
OK: 1698 / Failed: 1 / User-skipped: 364 / Auto-skipped: 0

offline_SUITE:mod_offline_tests:max_offline_messages_reached

{error,{{timeout,100,[{times,50,99}]},
    [{mongoose_helper,do_wait_until,2,
              [{file,"/home/circleci/project/big_tests/tests/mongoose_helper.erl"},
               {line,379}]},
     {offline_SUITE,'-max_offline_messages_reached/1-fun-1-',6,
            [{file,"/home/circleci/project/big_tests/tests/offline_SUITE.erl"},
             {line,254}]},
     {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,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

chrzaszcz

Looks good 👍

Remove commented code

cee62b9

This comment was marked as outdated.

Sign in to view

mongoose-im mentioned this pull request Mar 3, 2022

CI build failures summary #3360

Closed

gustawlippa force-pushed the mod_roster-map-config branch from 0cab5ec to 92ac1cf Compare March 3, 2022 10:53

This comment was marked as outdated.

Sign in to view

gustawlippa force-pushed the mod_roster-map-config branch from bb2408a to c8b2dad Compare March 3, 2022 12:19

This comment was marked as outdated.

Sign in to view

Use fresh_story to avoid interference with other tests

9ee4603

gustawlippa force-pushed the mod_roster-map-config branch from c8b2dad to 389d4af Compare March 3, 2022 12:47

This comment was marked as outdated.

Sign in to view

gustawlippa force-pushed the mod_roster-map-config branch from 389d4af to bbe59e2 Compare March 3, 2022 13:12

Put mod_roster config options in a map with defaults

fcc214b

gustawlippa force-pushed the mod_roster-map-config branch from bbe59e2 to fcc214b Compare March 3, 2022 14:01

gustawlippa marked this pull request as ready for review March 3, 2022 14:27

chrzaszcz reviewed Mar 3, 2022

View reviewed changes

test/config_parser_SUITE.erl Show resolved Hide resolved

Add test for mod_roster.riak section defaults

429ebac

chrzaszcz approved these changes Mar 4, 2022

View reviewed changes

chrzaszcz merged commit 35dd227 into master Mar 4, 2022

chrzaszcz deleted the mod_roster-map-config branch March 4, 2022 13:49

Premwoik added this to the 5.1.0 milestone May 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Put mod_roster config options in a map with defaults #3569

Put mod_roster config options in a map with defaults #3569

gustawlippa commented Mar 3, 2022 •

edited

Loading

This comment was marked as outdated.

codecov bot commented Mar 3, 2022 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Mar 3, 2022 •

edited

Loading

mongoose-im commented Mar 3, 2022 •

edited

Loading

chrzaszcz left a comment

mongoose-im commented Mar 4, 2022 •

edited

Loading

chrzaszcz left a comment

Put mod_roster config options in a map with defaults #3569

Put mod_roster config options in a map with defaults #3569

Conversation

gustawlippa commented Mar 3, 2022 • edited Loading

This comment was marked as outdated.

codecov bot commented Mar 3, 2022 • edited Loading

Codecov Report

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Mar 3, 2022 • edited Loading

mongoose-im commented Mar 3, 2022 • edited Loading

chrzaszcz left a comment

Choose a reason for hiding this comment

mongoose-im commented Mar 4, 2022 • edited Loading

chrzaszcz left a comment

Choose a reason for hiding this comment

gustawlippa commented Mar 3, 2022 •

edited

Loading

codecov bot commented Mar 3, 2022 •

edited

Loading

mongoose-im commented Mar 3, 2022 •

edited

Loading

mongoose-im commented Mar 3, 2022 •

edited

Loading

mongoose-im commented Mar 4, 2022 •

edited

Loading