Make smart_markers multitenancy ready #3243
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3243 +/- ##
==========================================
+ Coverage 80.33% 80.38% +0.05%
==========================================
Files 398 398
Lines 32540 32539 -1
==========================================
+ Hits 26142 26158 +16
+ Misses 6398 6381 -17
Continue to review full report at Codecov.
|
|
small_tests_24 / small_tests / add8845 internal_mnesia_24 / internal_mnesia / add8845 dynamic_domains_24 / pgsql_mnesia / add8845 small_tests_22 / small_tests / add8845 small_tests_23 / small_tests / add8845 dynamic_domains_23 / pgsql_mnesia / add8845 ldap_mnesia_24 / ldap_mnesia / add8845 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_21.844198@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}]}]}}ldap_mnesia_22 / ldap_mnesia / add8845 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / add8845 mysql_redis_24 / mysql_redis / add8845 pgsql_mnesia_22 / pgsql_mnesia / add8845 ldap_mnesia_23 / ldap_mnesia / add8845 pgsql_mnesia_24 / pgsql_mnesia / add8845 pgsql_mnesia_23 / pgsql_mnesia / add8845 mssql_mnesia_24 / odbc_mssql_mnesia / add8845 riak_mnesia_24 / riak_mnesia / add8845 |
|
small_tests_24 / small_tests / 7aeb3b1 internal_mnesia_24 / internal_mnesia / 7aeb3b1 amp_big_SUITE:basic:notify_deliver_to_online_user_recipient_privacy_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}]},
...small_tests_22 / small_tests / 7aeb3b1 dynamic_domains_24 / pgsql_mnesia / 7aeb3b1 dynamic_domains_23 / pgsql_mnesia / 7aeb3b1 small_tests_23 / small_tests / 7aeb3b1 ldap_mnesia_22 / ldap_mnesia / 7aeb3b1 ldap_mnesia_24 / ldap_mnesia / 7aeb3b1 ldap_mnesia_23 / ldap_mnesia / 7aeb3b1 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 7aeb3b1 pgsql_mnesia_22 / pgsql_mnesia / 7aeb3b1 pgsql_mnesia_24 / pgsql_mnesia / 7aeb3b1 mssql_mnesia_24 / odbc_mssql_mnesia / 7aeb3b1 inbox_SUITE:one_to_one:msg_sent_to_offline_user{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"bOb_msg_sent_to_offline_user_9.810764@localhost/new-session">>,
escalus_tcp,<0.17704.0>,
[{event_manager,<0.17538.0>},
{server,<<"localhost">>},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{resource,<<"new-session">>}],
[{event_client,
[{event_manager,<0.17538.0>},
{server,<<"localhost">>},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{resource,<<"new-session">>}]},
{resource,<<"new-session">>},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{event_client,
[{event_manager,<0.17538.0>},
{server,<<"localhost">>},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"bOb_msg_sent_to_offline_user_9.810764">>},
{server,<<"localhost">>},
{pas...mysql_redis_24 / mysql_redis / 7aeb3b1 pgsql_mnesia_23 / pgsql_mnesia / 7aeb3b1 riak_mnesia_24 / riak_mnesia / 7aeb3b1 mssql_mnesia_24 / odbc_mssql_mnesia / 7aeb3b1 inbox_SUITE:one_to_one:user_has_two_conversations{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"kate_user_has_two_conversations_89.368187@localhost/res1">>,
escalus_tcp,<0.17653.0>,
[{event_manager,<0.17512.0>},
{server,<<"localhost">>},
{username,<<"kate_user_has_two_conversations_89.368187">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.17512.0>},
{server,<<"localhost">>},
{username,
<<"kate_user_has_two_conversations_89.368187">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"kate_user_has_two_conversations_89.368187">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"kate_user_has_two_conversations_89.368187">>},
{server,<<"localhost">>},
{password,<<"makrowe;p">>},
{stream_id,<<"446b0050008b3894">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{inbox_helper,get_inbox,3,
[{file,"/home/circleci/app/big_tests/tests/inbox_helper.erl"},
{line,221}]},
{inbox_helper,check_inbox,4,
[{file,"/home/circleci/app/big_tests/tests/inbox_helper.erl"},
{line,167}]},
{inbo...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_97.975346">>,
<<"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}]}]}}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_97.995384">>,
<<"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}]}]}}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_97.996758">>,
<<"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}]}]}}inbox_SUITE:muclight:non_reset_marker_should_not_affect_muclight_inbox{error,{{badrpc,timeout},
[{escalus_rpc,call_with_cookie_match,
[mongooseim@localhost,ejabberd_admin,register,
[<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_97.996163">>,
<<"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}]}]}}inbox_SUITE:muclight:create_groupchat{error,{{badrpc,timeout},
[{escalus_rpc,call_with_cookie_match,
[mongooseim@localhost,ejabberd_admin,register,
[<<"alicE_create_groupchat_98.1402">>,<<"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}]}]}}inbox_SUITE:muclight:groupchat_markers_one_reset{error,{{badrpc,timeout},
[{escalus_rpc,call_with_cookie_match,
[mongooseim@localhost,ejabberd_admin,register,
[<<"bOb_groupchat_markers_one_reset_97.993499">>,
<<"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}]}]}}small_tests_24 / small_tests / 7aeb3b1 dynamic_domains_24 / pgsql_mnesia / 7aeb3b1 small_tests_22 / small_tests / 7aeb3b1 dynamic_domains_23 / pgsql_mnesia / 7aeb3b1 small_tests_23 / small_tests / 7aeb3b1 internal_mnesia_24 / internal_mnesia / 7aeb3b1 ldap_mnesia_22 / ldap_mnesia / 7aeb3b1 ldap_mnesia_23 / ldap_mnesia / 7aeb3b1 ldap_mnesia_24 / ldap_mnesia / 7aeb3b1 pgsql_mnesia_22 / pgsql_mnesia / 7aeb3b1 mysql_redis_24 / mysql_redis / 7aeb3b1 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 7aeb3b1 pgsql_mnesia_24 / pgsql_mnesia / 7aeb3b1 mssql_mnesia_24 / odbc_mssql_mnesia / 7aeb3b1 pgsql_mnesia_23 / pgsql_mnesia / 7aeb3b1 riak_mnesia_24 / riak_mnesia / 7aeb3b1 |
Mainly makes smart_markers multitenancy ready. This also moves around some formatting like removing variable names in spec declarations or reordering some variables.