Unfold global options without the temporary functions #3406
Conversation
These functions made it difficult to rework the resulting
internal config structure and test the expected parsed config.
Now the unfolding is explicit.
In the future we might want to get rid of unfolding
and just use {Key, global}.
However, this might mean one extra lookup for each option.
This is needed by the config parser before key unfolding. I decided not to complicate types by introducing an extra type here for the unfolded keys.
chrzaszcz
force-pushed
the
config-unfold-global
branch
2 times, most recently
from
03ecf5a
to
9610799
Compare
|
small_tests_24 / small_tests / b2f3079 internal_mnesia_24 / internal_mnesia / b2f3079 |
|
small_tests_24 / small_tests / 03ecf5a internal_mnesia_24 / internal_mnesia / 03ecf5a |
Codecov Report
@@ Coverage Diff @@
## master #3406 +/- ##
==========================================
- Coverage 80.96% 80.93% -0.04%
==========================================
Files 414 414
Lines 32300 32301 +1
==========================================
- Hits 26153 26142 -11
- Misses 6147 6159 +12
Continue to review full report at Codecov.
|
|
small_tests_24 / small_tests / 9610799 internal_mnesia_24 / internal_mnesia / 9610799 small_tests_23 / small_tests / 9610799 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 9610799 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 9610799 dynamic_domains_mysql_redis_24 / mysql_redis / 9610799 ldap_mnesia_24 / ldap_mnesia / 9610799 ldap_mnesia_23 / ldap_mnesia / 9610799 connect_SUITE:just_tls:feature_order:auth_bind_compression_session{error,
{{badmatch,
{error,
{connection_step_failed,
{{escalus_session,session},
{client,
<<"secure_joe_auth_bind_compression_session_91.85893@localhost/escalus-default-resource">>,
escalus_tcp,<0.12124.0>,undefined,
[{username,
<<"secure_joe_auth_bind_compression_session_91.85893">>},
{server,<<"localhost">>},
{password,<<"break_me">>},
{compression,<<"zlib">>},
{starttls,required},
{host,<<"localhost">>},
{stream_id,<<"305a63e1bc541c53">>},
{resource,<<"escalus-default-resource">>}]},
[{compression,false},
{starttls,false},
{stream_management,false},
{advanced_message_processing,false},
{client_state_indication,false},
{sasl_mechanisms,[]},
{caps,undefined}]},
{timeout,session_reply}}}},
[{connect_SUITE,auth_bind_compression_session,1,
[{file,"/home/circleci/app/big_tests/tests/connect_SUITE.erl"},
{line,519}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1784}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1293}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1225}]}]}}connect_SUITE:just_tls:feature_order:auth_compression_bind_session{error,
{{badmatch,
{error,
{connection_step_failed,
{{escalus_session,maybe_use_compression},
{client,
<<"secure_joe_auth_compression_bind_session_91.91955@localhost">>,
escalus_tcp,<0.12125.0>,undefined,
[{username,
<<"secure_joe_auth_compression_bind_session_91.91955">>},
{server,<<"localhost">>},
{password,<<"break_me">>},
{compression,<<"zlib">>},
{starttls,required},
{host,<<"localhost">>},
{stream_id,<<"f8c0dc1c512c2058">>}]},
[{compression,[<<"zlib">>]},
{starttls,false},
{stream_management,true},
{advanced_message_processing,true},
{client_state_indication,false},
{sasl_mechanisms,[<<"PLAIN">>]},
{caps,undefined}]},
{timeout,wait_for_features}}}},
[{connect_SUITE,auth_compression_bind_session,1,
[{file,"/home/circleci/app/big_tests/tests/connect_SUITE.erl"},
{line,509}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1784}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1293}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1225}]}]}}dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 9610799 sm_SUITE:parallel_manual_ack_freq_1:resume_session_state_stop_c2s{error,{thrown,{timeout,msg}}}mysql_redis_24 / mysql_redis / 9610799 pgsql_mnesia_24 / pgsql_mnesia / 9610799 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 9610799 pgsql_mnesia_23 / pgsql_mnesia / 9610799 mssql_mnesia_24 / odbc_mssql_mnesia / 9610799 riak_mnesia_24 / riak_mnesia / 9610799 |
Now the tests are just checking for {Key, global} and {Key, <<"myhost">>}.
chrzaszcz
force-pushed
the
config-unfold-global
branch
from
9610799
to
cd88a63
Compare
|
small_tests_24 / small_tests / cd88a63 internal_mnesia_24 / internal_mnesia / cd88a63 small_tests_23 / small_tests / cd88a63 dynamic_domains_mysql_redis_24 / mysql_redis / cd88a63 ldap_mnesia_24 / ldap_mnesia / cd88a63 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / cd88a63 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / cd88a63 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / cd88a63 ldap_mnesia_23 / ldap_mnesia / cd88a63 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / cd88a63 pgsql_mnesia_24 / pgsql_mnesia / cd88a63 sm_SUITE:parallel_manual_ack_freq_1:resume_session_state_send_message{error,
{{assertion_failed,assert_many,true,
[#Fun<sm_SUITE.22.149602>,#Fun<sm_SUITE.22.149602>,
#Fun<sm_SUITE.22.149602>],
[{xmlel,<<"presence">>,
[{<<"from">>,
<<"alicE_resume_session_state_send_message_97.965476@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alice_resume_session_state_send_message_97.965476@localhost/escalus-default-resource">>},
{<<"xml:lang">>,<<"en">>}],
[]},
{xmlel,<<"message">>,
[{<<"from">>,
<<"bOb_resume_session_state_send_message_97.892774@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alicE_resume_session_state_send_message_97.965476@localhost">>},
{<<"xml:lang">>,<<"en">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-1">>}]},
{xmlel,<<"delay">>,
[{<<"xmlns">>,<<"urn:xmpp:delay">>},
{<<"stamp">>,<<"2021-11-18T10:33:18.042786Z">>},
{<<"from">>,<<"localhost">>}],
[{xmlcdata,<<"SM Storage">>}]}]},
{xmlel,<<"message">>,
[{<<"from">>,
<<"bOb_resume_session_state_send_message_97.892774@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alicE_resume_session_state_send_message_97.965476@localhost">>},
{<<"xml:lang">>,<<"en">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-2">>}]},
{xmlel,<<"delay">>,
[{<<"xmlns">>,<<"urn:xmpp:delay"...sm_SUITE:parallel_manual_ack_freq_1:resume_session_state_send_message{error,
{{assertion_failed,assert_many,true,
[#Fun<sm_SUITE.22.149602>,#Fun<sm_SUITE.22.149602>,
#Fun<sm_SUITE.22.149602>],
[{xmlel,<<"presence">>,
[{<<"from">>,
<<"alicE_resume_session_state_send_message_4.392783@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alice_resume_session_state_send_message_4.392783@localhost/escalus-default-resource">>},
{<<"xml:lang">>,<<"en">>}],
[]},
{xmlel,<<"message">>,
[{<<"from">>,
<<"bOb_resume_session_state_send_message_4.288227@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alicE_resume_session_state_send_message_4.392783@localhost">>},
{<<"xml:lang">>,<<"en">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-1">>}]},
{xmlel,<<"delay">>,
[{<<"xmlns">>,<<"urn:xmpp:delay">>},
{<<"stamp">>,<<"2021-11-18T10:33:24.484866Z">>},
{<<"from">>,<<"localhost">>}],
[{xmlcdata,<<"SM Storage">>}]}]},
{xmlel,<<"message">>,
[{<<"from">>,
<<"bOb_resume_session_state_send_message_4.288227@localhost/escalus-default-resource">>},
{<<"to">>,
<<"alicE_resume_session_state_send_message_4.392783@localhost">>},
{<<"xml:lang">>,<<"en">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-2">>}]},
{xmlel,<<"delay">>,
[{<<"xmlns">>,<<"urn:xmpp:delay">>},
...mssql_mnesia_24 / odbc_mssql_mnesia / cd88a63 mysql_redis_24 / mysql_redis / cd88a63 mam_SUITE:rdbms_prefs_cases:prefs_set_cdata_request{error,{test_case_failed,"ASSERT EQUAL\n\tExpected {prefs_result_iq,<<\"roster\">>,\n [<<\"montague@montague.net\">>,\n <<\"romeo@montague.net\">>],\n []}\n\tValue {prefs_result_iq,<<\"always\">>,\n [<<\"montague@montague.net\">>,\n <<\"romeo@montague.net\">>],\n []}\n"}}s2s_SUITE:both_tls_required:simple_message{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,<<"alicE_simple_message_59.672260@localhost/res1">>,
escalus_tcp,<0.8988.2>,
[{event_manager,<0.8983.2>},
{server,<<"localhost">>},
{username,<<"alicE_simple_message_59.672260">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.8983.2>},
{server,<<"localhost">>},
{username,<<"alicE_simple_message_59.672260">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"alicE_simple_message_59.672260">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"alicE_simple_message_59.672260">>},
{server,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"103fa4947bf49f51">>}]},
10000],
[{file,
"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{s2s_SUITE,'-simple_message/1-fun-0-',2,
[{file,"/home/circleci/app/big_tests/tests/s2s_SUITE.erl"},
{line,131}]},
{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"}...service_domain_db_SUITE:db:db_keeps_syncing_after_cluster_join{error,{test_case_failed,{[<<"example1.com">>],
[<<"example1.com">>,<<"example2.com">>]}}}pgsql_mnesia_23 / pgsql_mnesia / cd88a63 riak_mnesia_24 / riak_mnesia / cd88a63 pgsql_mnesia_24 / pgsql_mnesia / cd88a63 mysql_redis_24 / mysql_redis / cd88a63 mam_SUITE:rdbms_async_cache_prefs_cases:messages_filtered_when_prefs_default_policy_is_roster{error,{test_case_failed,"ASSERT EQUAL\n\tExpected []\n\tValue [ok]\n"}} |
The goal of this PR is to simplify the config processing so that no temporary functions are inserted into the option list.
This makes it easier to rework the internal structure (e.g. using maps) and to maintain and understand the unit tests.
It also simplifies the subsequent unit test rework needed to support config defaults.
Another advantage of the new unit test macros is that we could rework the config not to unfold the global options and most of the unit tests would stay the same.