Mongoose Config with persistent terms #3343
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
df25256
to
dc88ddc
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
dc88ddc
to
a5b7685
Compare
This comment has been minimized.
This comment has been minimized.
Codecov Report
@@ Coverage Diff @@
## persistent-term-config #3343 +/- ##
==========================================================
+ Coverage 80.68% 80.80% +0.12%
==========================================================
Files 397 397
Lines 32375 32287 -88
==========================================================
- Hits 26121 26091 -30
+ Misses 6254 6196 -58
Continue to review full report at Codecov.
|
chrzaszcz
force-pushed
the
mongoose_config
branch
from
a5b7685
to
95bdf67
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
95bdf67
to
39c5672
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
39c5672
to
2a2bbef
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
2a2bbef
to
08d1a5c
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
0848d94
to
bb8cfcb
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
bb8cfcb
to
137de7a
Compare
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
137de7a
to
f0ad424
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
chrzaszcz
force-pushed
the
mongoose_config
branch
from
2c4a9c9
to
2eb1e6a
Compare
This comment has been minimized.
This comment has been minimized.
The config is now stored in persistent terms. Other changes: - Removed checks like 'is_integer' for already validated options - Eliminated the error-prone and ambiguous default value 'undefined' - Removed obsolete code, e.g. handlers for non-existing hooks
- Do not mock the config as it is easier to just set the values
Also: make the config backup/change/restore helpers more consistent.
This module was handling the old versions of ejabberd
This option is set only for host types
chrzaszcz
force-pushed
the
mongoose_config
branch
from
2eb1e6a
to
f2e2c4a
Compare
|
small_tests_24 / small_tests / f2e2c4a internal_mnesia_24 / internal_mnesia / f2e2c4a small_tests_23 / small_tests / f2e2c4a dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / f2e2c4a service_domain_db_SUITE:db:db_keeps_syncing_after_cluster_join{error,{test_case_failed,{[<<"example1.com">>,<<"example2.com">>,
<<"example3.com">>],
[<<"example1.com">>,<<"example2.com">>,
<<"example3.com">>,<<"example4.com">>]}}}ldap_mnesia_24 / ldap_mnesia / f2e2c4a ldap_mnesia_23 / ldap_mnesia / f2e2c4a dynamic_domains_mysql_redis_24 / mysql_redis / f2e2c4a dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / f2e2c4a dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / f2e2c4a pgsql_mnesia_24 / pgsql_mnesia / f2e2c4a mssql_mnesia_24 / odbc_mssql_mnesia / f2e2c4a mysql_redis_24 / mysql_redis / f2e2c4a elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / f2e2c4a riak_mnesia_24 / riak_mnesia / f2e2c4a pgsql_mnesia_23 / pgsql_mnesia / f2e2c4a dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / f2e2c4a |
NelsonVides
reviewed
Oct 22, 2021
| -ignore_xref([config_state/0, config_states/0, all_cluster_nodes/0]). | ||
|
|
||
| -include("mongoose.hrl"). | ||
| -include("ejabberd_config.hrl"). |
There was a problem hiding this comment.
Why don't we make this include also a mongoose_config.hrl?
There was a problem hiding this comment.
I didn't do it yet because I wasn't sure whether I should remove the local_config record completely or rename the header file. I was planning to do this later. I added a line about that to the PR description.
NelsonVides
reviewed
Oct 25, 2021
There was a problem hiding this comment.
Just had a look at the small tests. The amount of meck removals is amazing.
New -> https://circleci-mim-results.s3.eu-central-1.amazonaws.com/PR/3343/81744/small_tests.24.0.5/small/ct_run.mongooseim@localhost.2021-10-22_10.30.56/lib.mongooseim.logs/run.2021-10-22_10.30.56/suite.log.html
Old -> https://circleci-mim-results.s3.eu-central-1.amazonaws.com/branch/master/82436/small_tests.24.0.5/small/ct_run.mongooseim@localhost.2021-10-25_12.31.00/lib.mongooseim.logs/run.2021-10-25_12.31.00/suite.log.html
and small tests seem to be quite faster!
test/mongoose_config_SUITE.erl is I guess an in-place replacement for the gone ejabberd equivalent, but it's doing cluster tests in a very dirty way. I guess this one is not the place to change that, but we might want to note that somewhere.
Left to review, big_tests, coming soon.
gustawlippa
reviewed
Oct 25, 2021
gustawlippa
approved these changes
Oct 25, 2021
|
small_tests_24 / small_tests / 397ca5f internal_mnesia_24 / internal_mnesia / 397ca5f small_tests_23 / small_tests / 397ca5f ldap_mnesia_24 / ldap_mnesia / 397ca5f ldap_mnesia_23 / ldap_mnesia / 397ca5f dynamic_domains_mysql_redis_24 / mysql_redis / 397ca5f rest_client_SUITE:muc:messages_can_be_paginated_in_room{error,
{{assertion_failed,assert,is_chat_message,
[<<"ec8cfea0">>],
{xmlel,<<"message">>,
[{<<"to">>,<<"1635-174664-766219@muclight2.domain.example.com">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"5be9913a">>}]}]},
"<message to='1635-174664-766219@muclight2.domain.example.com' type='chat'><body>5be9913a</body></message>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{rest_client_SUITE,assert_room_messages,2,
[{file,"/home/circleci/app/big_tests/tests/rest_client_SUITE.erl"},
{line,772}]},
{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}]}]}}dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 397ca5f inbox_SUITE:muclight:non_reset_marker_should_not_affect_muclight_inbox{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_74.132497@domain.example.com/res1">>,
escalus_tcp,<0.16465.0>,
[{event_manager,<0.16406.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_74.132497">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16406.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_74.132497">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_74.132497">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_non_reset_marker_should_not_affect_muclight_inbox_74.132497">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"ff15ed02b9ead5c0">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_light_he...inbox_SUITE:muclight:groupchat_markers_all_reset_room_created{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_groupchat_markers_all_reset_room_created_74.154994@domain.example.com/res1">>,
escalus_tcp,<0.16468.0>,
[{event_manager,<0.16464.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_all_reset_room_created_74.154994">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16464.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_all_reset_room_created_74.154994">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_groupchat_markers_all_reset_room_created_74.154994">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_groupchat_markers_all_reset_room_created_74.154994">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"9407fe1bb771d4b8">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_helper,'-foreach_recipient/2-fun-0-',2,
[{file...inbox_SUITE:muclight:leave_and_remove_conversation{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_leave_and_remove_conversation_74.153784@domain.example.com/res1">>,
escalus_tcp,<0.16467.0>,
[{event_manager,<0.16431.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_leave_and_remove_conversation_74.153784">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16431.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_leave_and_remove_conversation_74.153784">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_leave_and_remove_conversation_74.153784">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_leave_and_remove_conversation_74.153784">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"1d99ea6049330ec0">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_light_helper,given_muc_light_room,3,
[{file,"/home/circleci/app/big_tests/tests/muc_light_helper.erl"...inbox_SUITE:muclight:groupchat_markers_one_reset_room_created{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_groupchat_markers_one_reset_room_created_74.153584@domain.example.com/res1">>,
escalus_tcp,<0.16470.0>,
[{event_manager,<0.16443.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_one_reset_room_created_74.153584">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16443.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_one_reset_room_created_74.153584">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_groupchat_markers_one_reset_room_created_74.153584">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_groupchat_markers_one_reset_room_created_74.153584">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"4299273c5e3a9167">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_helper,'-foreach_recipient/2-fun-0-',2,
[{file...inbox_SUITE:muclight:simple_groupchat_stored_in_all_inbox{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_simple_groupchat_stored_in_all_inbox_74.149013@domain.example.com/res1">>,
escalus_tcp,<0.16473.0>,
[{event_manager,<0.16417.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_simple_groupchat_stored_in_all_inbox_74.149013">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16417.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_simple_groupchat_stored_in_all_inbox_74.149013">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_simple_groupchat_stored_in_all_inbox_74.149013">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_simple_groupchat_stored_in_all_inbox_74.149013">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"890a322088e515e1">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_light_helper,given_muc_light_room,3,
[{file,"/home/circleci/app/bi...inbox_SUITE:muclight:advanced_groupchat_stored_in_all_inbox{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_advanced_groupchat_stored_in_all_inbox_74.153801@domain.example.com/res1">>,
escalus_tcp,<0.16471.0>,
[{event_manager,<0.16452.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_advanced_groupchat_stored_in_all_inbox_74.153801">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16452.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_advanced_groupchat_stored_in_all_inbox_74.153801">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_advanced_groupchat_stored_in_all_inbox_74.153801">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_advanced_groupchat_stored_in_all_inbox_74.153801">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"900cafffb2495535">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_light_helper,given_muc_light_room,3,
[{file,"/home/circl...inbox_SUITE:muclight:groupchat_markers_one_reset{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_groupchat_markers_one_reset_74.154153@domain.example.com/res1">>,
escalus_tcp,<0.16469.0>,
[{event_manager,<0.16459.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_one_reset_74.154153">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16459.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_markers_one_reset_74.154153">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_groupchat_markers_one_reset_74.154153">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_groupchat_markers_one_reset_74.154153">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"2a516d08d89267ca">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_light_helper,given_muc_light_room,3,
[{file,"/home/circleci/app/big_tests/tests/muc_light_helper.erl"},
...inbox_SUITE:muclight:create_groupchat{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"bOb_create_groupchat_74.151838@domain.example.com/res1">>,
escalus_tcp,<0.16482.0>,
[{event_manager,<0.16438.0>},
{server,<<"domain.example.com">>},
{username,<<"bOb_create_groupchat_74.151838">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16438.0>},
{server,<<"domain.example.com">>},
{username,<<"bOb_create_groupchat_74.151838">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"bOb_create_groupchat_74.151838">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"bOb_create_groupchat_74.151838">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"makrolika">>},
{stream_id,<<"771f6fd22d121745">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_helper,'-foreach_recipient/2-fun-0-',2,
[{file,"/home/circleci/app/big_tests/tests/muc_helper.erl"},
{line,45}]},
{lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
{muc_light_helper,verify_aff_bcast,3,
[{fi...inbox_SUITE:muclight:groupchat_reset_stanza_resets_inbox{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alicE_groupchat_reset_stanza_resets_inbox_74.149410@domain.example.com/res1">>,
escalus_tcp,<0.16466.0>,
[{event_manager,<0.16422.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_reset_stanza_resets_inbox_74.149410">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.16422.0>},
{server,<<"domain.example.com">>},
{username,
<<"alicE_groupchat_reset_stanza_resets_inbox_74.149410">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alicE_groupchat_reset_stanza_resets_inbox_74.149410">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_groupchat_reset_stanza_resets_inbox_74.149410">>},
{server,<<"domain.example.com">>},
{host,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"5d9a92171e1bdd9c">>}]},
5000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{muc_helper,'-foreach_recipient/2-fun-0-',2,
[{file,"/home/circleci/app/big_...inbox_SUITE:muclight:end_per_group{error,
{{badrpc,
{'EXIT',
{timeout,
{gen_server,call,
['wpool_pool-mongoose_wpool$rdbms$global$default-3',
{sql_cmd,
{sql_execute,muc_light_config_delete_all,[]},
-576460457487},
60000]}}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost,timeout => 15000},
mod_muc_light,force_clear_from_ct,[]],
[{file,"/home/circleci/app/big_tests/tests/distributed_helper.erl"},
{line,117}]},
{inbox_SUITE,end_per_group,2,
[{file,"/home/circleci/app/big_tests/tests/inbox_SUITE.erl"},
{line,240}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1380}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1224}]}]}}dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 397ca5f sm_SUITE:parallel_manual_ack_freq_1:resume_session_state_stop_c2s{error,{thrown,{timeout,msg}}}elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 397ca5f pgsql_mnesia_24 / pgsql_mnesia / 397ca5f pgsql_mnesia_23 / pgsql_mnesia / 397ca5f mysql_redis_24 / mysql_redis / 397ca5f mssql_mnesia_24 / odbc_mssql_mnesia / 397ca5f pep_SUITE:pep_tests:delayed_receive_with_sm{error,{{badmatch,[]},
[{pep_SUITE,'-delayed_receive_with_sm/1-fun-0-',3,
[{file,"/home/circleci/app/big_tests/tests/pep_SUITE.erl"},
{line,295}]},
{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}]}]}}pep_SUITE:pep_tests:h_ok_after_notify_test{error,{{assertion_failed,assert_many,false,[is_roster_set],[],[]},
[{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,'-make_all_clients_friends/1-fun-0-',2,
[{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,117}]},
{escalus_utils,'-each_with_index/3-fun-0-',3,
[{file,"/home/circleci/app/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/app/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/app/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
{line,60}]},
{escalus_story,make_all_clients_friends,1,
[{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,106}]}]}}riak_mnesia_24 / riak_mnesia / 397ca5f dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 397ca5f 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}]}]}}carboncopy_SUITE:all:prop_forward_received_chat_messages{error,
{{assertEqual,
[{module,carboncopy_SUITE},
{line,278},
{expression,
"proper : quickcheck ( proper : conjunction ( [ { PropName , Property } ] ) , [ verbose , long_result , { numtests , 3 } ] )"},
{expected,true},
{value,
[[{forward_received,
[{4,<<"Now, fair Hippolyta, our nuptial hour">>}]}]]}]},
[{carboncopy_SUITE,run_prop,2,
[{file,"/home/circleci/app/big_tests/tests/carboncopy_SUITE.erl"},
{line,278}]},
{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}]}]}}carboncopy_SUITE:all:prop_normal_routing_to_bare_jid{error,
{{assertEqual,
[{module,carboncopy_SUITE},
{line,278},
{expression,
"proper : quickcheck ( proper : conjunction ( [ { PropName , Property } ] ) , [ verbose , long_result , { numtests , 3 } ] )"},
{expected,true},
{value,
[[{normal_routing,
[{5,<<"Now, fair Hippolyta, our nuptial hour">>}]}]]}]},
[{carboncopy_SUITE,run_prop,2,
[{file,"/home/circleci/app/big_tests/tests/carboncopy_SUITE.erl"},
{line,278}]},
{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}]}]}}carboncopy_SUITE:all:prop_forward_sent_chat_messages{error,
{{assertEqual,
[{module,carboncopy_SUITE},
{line,278},
{expression,
"proper : quickcheck ( proper : conjunction ( [ { PropName , Property } ] ) , [ verbose , long_result , { numtests , 3 } ] )"},
{expected,true},
{value,
[[{forward_sent,
[{5,
<<"This old moon wanes! she lingers my desires">>}]}]]}]},
[{carboncopy_SUITE,run_prop,2,
[{file,"/home/circleci/app/big_tests/tests/carboncopy_SUITE.erl"},
{line,278}]},
{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}]}]}} |
NelsonVides
approved these changes
Oct 25, 2021
|
|
||
| is_vcard_ldap() -> | ||
| ldap == rpc(mim(), gen_mod, get_module_opt, | ||
| [ct:get_config({hosts, mim, domain}), mod_vcard, backend, mnesia]). |
There was a problem hiding this comment.
domain and not host_type? Also, can we use here the helpers from domain_helper instead?
There was a problem hiding this comment.
I just moved it as it was from vcard_update... and I missed the domain.
vkatsuba
approved these changes
Oct 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The changeset is extensive as the main intention is to avoid the transitional state with both
ejabberd_configandmongoose_configpresent.Changes in this PR:
mongoose_configmodule which replacesejabberd_configand stores the configuration in persistent terms.is_integerfor already validated config options were removed.undefinedwas reduced as it led to some bugs in the past and it is better to:mongoose_config:lookup_opt/1, which makes it clear if the option is set or notmongoose_config:get_opt/1, which fails when a required option was missing.mongoose_config.mongoose_helperfor big tests that backup, change and restore config options.sasl_mechanismsas a global option - it is impossible to get such on option from the config file, it is always per host type.vcard_updatemodule that was a leftover from a very old version.Omitted from this PR:
listenoption in the config.mongoose_configejabberd_config.hrltomongoose_config.hrl