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

Enable domain_removal_SUITE for dynamic_domains.spec #3235

Merged
merged 2 commits into from
Aug 27, 2021

Conversation

arcusfelis
Copy link
Contributor

@arcusfelis arcusfelis commented Aug 27, 2021

This PR addresses MIM-1453 / MIM-1480, "domain removal actually does something for dynamic domains - verified".

Proposed changes include:

  • edit spec
  • fix initialization in tests

@codecov
Copy link

codecov bot commented Aug 27, 2021

Codecov Report

Merging #3235 (d136282) into master (6afa847) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3235      +/-   ##
==========================================
- Coverage   80.32%   80.30%   -0.02%     
==========================================
  Files         398      398              
  Lines       32526    32526              
==========================================
- Hits        26126    26120       -6     
- Misses       6400     6406       +6     
Impacted Files Coverage Δ
src/mod_roster_mnesia.erl 72.72% <0.00%> (-21.22%) ⬇️
src/mod_roster_riak.erl 81.53% <0.00%> (-15.39%) ⬇️
src/mongoose_tcp_listener.erl 76.59% <0.00%> (-4.26%) ⬇️
src/muc_light/mod_muc_light_db_mnesia.erl 88.54% <0.00%> (-1.05%) ⬇️
src/global_distrib/mod_global_distrib_utils.erl 64.48% <0.00%> (-0.94%) ⬇️
src/mod_muc.erl 74.88% <0.00%> (-0.23%) ⬇️
src/mod_muc_room.erl 77.12% <0.00%> (-0.06%) ⬇️
src/ejabberd_sm.erl 84.26% <0.00%> (ø)
src/mam/mod_mam_meta.erl 94.73% <0.00%> (+1.05%) ⬆️
src/auth/ejabberd_auth.erl 83.93% <0.00%> (+1.55%) ⬆️
... and 5 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 6afa847...d136282. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Aug 27, 2021

small_tests_24 / small_tests / d457f81
Reports root / small


internal_mnesia_24 / internal_mnesia / d457f81
Reports root/ big
OK: 1643 / Failed: 1 / User-skipped: 288 / Auto-skipped: 0

amp_big_SUITE:offline:offline_success:error_deliver_to_online_user_test
{error,
  {{assertion_failed,assert,is_presence,
     {xmlel,<<"stream:error">>,[],
       [{xmlel,<<"conflict">>,
          [{<<"xmlns">>,<<"urn:ietf:params:xml:ns:xmpp-streams">>}],
          []},
        {xmlel,<<"text">>,
          [{<<"xml:lang">>,<<"en">>},
           {<<"xmlns">>,<<"urn:ietf:params:xml:ns:xmpp-streams">>}],
          [{xmlcdata,<<"Replaced by new connection">>}]}]},
     "<stream:error><conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams'/><text xml:lang='en' xmlns='urn:ietf:params:xml:ns:xmpp-streams'>Replaced by new connection</text></stream:error>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {escalus_story,'-drop_presences/2-lc$^0/1-0-',1,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,190}]},
    {escalus_story,drop_presences,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,190}]},
    {escalus_story,'-start_ready_clients/2-fun-0-',3,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,135}]},
    {lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
    {escalus_story,start_ready_clients,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,128}]},
   ...

Report log


small_tests_22 / small_tests / d457f81
Reports root / small


dynamic_domains_24 / pgsql_mnesia / d457f81
Reports root/ big
OK: 1690 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / d457f81
Reports root/ big
OK: 1690 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_23 / small_tests / d457f81
Reports root / small


ldap_mnesia_24 / ldap_mnesia / d457f81
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_22 / ldap_mnesia / d457f81
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / d457f81
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / d457f81
Reports root/ big
OK: 1891 / Failed: 0 / User-skipped: 284 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / d457f81
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 201 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / d457f81
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_22 / pgsql_mnesia / d457f81
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / d457f81
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / d457f81
Reports root/ big
OK: 3099 / Failed: 1 / User-skipped: 184 / Auto-skipped: 0

carboncopy_SUITE:all:unavailable_resources_dont_get_carbons
{error,{{assertion_failed,assert_many,false,[is_presence,is_presence],[],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/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


riak_mnesia_24 / riak_mnesia / d457f81
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 287 / 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!

Comment on lines 47 to 49
host_type() ->
ct:get_config({hosts, mim, host_type}).

Copy link
Member

Choose a reason for hiding this comment

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

Maybe use domain_helper:host_type()?

@mongoose-im
Copy link
Collaborator

mongoose-im commented Aug 27, 2021

small_tests_24 / small_tests / d136282
Reports root / small


internal_mnesia_24 / internal_mnesia / d136282
Reports root/ big
OK: 1588 / Failed: 0 / User-skipped: 288 / Auto-skipped: 0


dynamic_domains_24 / pgsql_mnesia / d136282
Reports root/ big
OK: 1690 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_22 / small_tests / d136282
Reports root / small


dynamic_domains_23 / pgsql_mnesia / d136282
Reports root/ big
OK: 1690 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_23 / small_tests / d136282
Reports root / small


ldap_mnesia_24 / ldap_mnesia / d136282
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_22 / ldap_mnesia / d136282
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / d136282
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / d136282
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / d136282
Reports root/ big
OK: 1891 / Failed: 0 / User-skipped: 284 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / d136282
Reports root/ big
OK: 3092 / Failed: 2 / User-skipped: 201 / Auto-skipped: 0

jingle_SUITE:all:jingle_session_is_established_with_a_conference_room
{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"*[email protected]">>},
        {<<"to">>,
         <<"alice_jingle_session_is_established_with_a_conference_room_62.462778@localhost/res1">>},
        {<<"id">>,<<"16ce9d52-dd41-4c55-b6ff-4c66733073a4">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-info">>},
           {<<"sid">>,<<"689af36b-1b79-435d-be3e-7d3167b0d010">>}],
          [{xmlel,<<"ringing">>,
             [{<<"xmlns">>,<<"urn:xmpp:jingle:apps:rtp:info:1">>}],
             []}]}]},
     "<iq from='*[email protected]' to='alice_jingle_session_is_established_with_a_conference_room_62.462778@localhost/res1' id='16ce9d52-dd41-4c55-b6ff-4c66733073a4' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-info' sid='689af36b-1b79-435d-be3e-7d3167b0d010'><ringing xmlns='urn:xmpp:jingle:apps:rtp:info:1'/></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,393}]},
    {jingle_SUITE,
      '-jingle_session_is_established_with_a_conference_room/1-fun-0-',1,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,1...

Report log

mod_event_pusher_rabbit_SUITE:group_chat_message_publish:group_chat_message_received_event_properly_formatted
{error,
  {{assertMatch,
     [{module,mod_event_pusher_rabbit_SUITE},
      {line,435},
      {expression,
        "get_decoded_message_from_rabbit ( AliceGroupChatMsgRecvRK )"},
      {pattern,
        "# { << \"from_user_id\" >> := BobRoomJID , << \"to_user_id\" >> := AliceFullJID , << \"message\" >> := Message }"},
      {value,
        #{<<"from_user_id">> => <<"[email protected]">>,
        <<"message">> => <<>>,
        <<"to_user_id">> =>
          <<"alice_unnamed_93.192483@localhost/res1">>}}]},
   [{mod_event_pusher_rabbit_SUITE,
      '-group_chat_message_received_event_properly_formatted/1-fun-1-',3,
      [{file,
         "/home/circleci/app/big_tests/tests/mod_event_pusher_rabbit_SUITE.erl"},
       {line,435}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/app/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


pgsql_mnesia_22 / pgsql_mnesia / d136282
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / d136282
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / d136282
Reports root/ big
OK: 3084 / Failed: 4 / User-skipped: 184 / Auto-skipped: 0

inbox_SUITE:muclight:advanced_groupchat_stored_in_all_inbox
{error,{{badrpc,timeout},
    [{escalus_rpc,call_with_cookie_match,
            [mongooseim@localhost,ejabberd_admin,register,
             [<<"alicE_advanced_groupchat_stored_in_all_inbox_11.182587">>,
            <<"localhost">>,<<"matygrysa">>],
             3000,ejabberd],
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_rpc.erl"},
             {line,34}]},
     {lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
     {escalus_ejabberd,create_users,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_ejabberd.erl"},
              {line,211}]},
     {escalus_fresh,create_users,2,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,62}]},
     {escalus_fresh,story,3,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,27}]},
     {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

inbox_SUITE:muclight:groupchat_markers_all_reset_room_created
{error,{{badrpc,timeout},
    [{escalus_rpc,call_with_cookie_match,
            [mongooseim@localhost,ejabberd_admin,register,
             [<<"bOb_groupchat_markers_all_reset_room_created_11.218813">>,
            <<"localhost">>,<<"makrolika">>],
             3000,ejabberd],
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_rpc.erl"},
             {line,34}]},
     {lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
     {escalus_ejabberd,create_users,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_ejabberd.erl"},
              {line,211}]},
     {escalus_fresh,create_users,2,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,62}]},
     {escalus_fresh,story,3,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,27}]},
     {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

inbox_SUITE:muclight:simple_groupchat_stored_in_all_inbox
{error,{{badrpc,timeout},
    [{escalus_rpc,call_with_cookie_match,
            [mongooseim@localhost,ejabberd_admin,register,
             [<<"alicE_simple_groupchat_stored_in_all_inbox_11.239088">>,
            <<"localhost">>,<<"matygrysa">>],
             3000,ejabberd],
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_rpc.erl"},
             {line,34}]},
     {lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
     {escalus_ejabberd,create_users,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_ejabberd.erl"},
              {line,211}]},
     {escalus_fresh,create_users,2,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,62}]},
     {escalus_fresh,story,3,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,27}]},
     {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

inbox_SUITE:muclight:groupchat_reset_stanza_resets_inbox
{error,{{badrpc,timeout},
    [{escalus_rpc,call_with_cookie_match,
            [mongooseim@localhost,ejabberd_admin,register,
             [<<"alicE_groupchat_reset_stanza_resets_inbox_11.247788">>,
            <<"localhost">>,<<"matygrysa">>],
             3000,ejabberd],
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_rpc.erl"},
             {line,34}]},
     {lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
     {escalus_ejabberd,create_users,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_ejabberd.erl"},
              {line,211}]},
     {escalus_fresh,create_users,2,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,62}]},
     {escalus_fresh,story,3,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_fresh.erl"},
             {line,27}]},
     {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


riak_mnesia_24 / riak_mnesia / d136282
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 287 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / d136282
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0

@chrzaszcz chrzaszcz merged commit 3e61c13 into master Aug 27, 2021
@chrzaszcz chrzaszcz deleted the mu-domain-removal-for-dynamic-domains-spec branch August 27, 2021 16:01
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
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.

5 participants