Use 'format_items = map' by default for config sections #3655
Conversation
|
small_tests_24 / small_tests / 1544b56 small_tests_23 / small_tests / 1544b56 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 1544b56 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 1544b56 dynamic_domains_mysql_redis_24 / mysql_redis / 1544b56 ldap_mnesia_23 / ldap_mnesia / 1544b56 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 1544b56 ldap_mnesia_24 / ldap_mnesia / 1544b56 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 1544b56 internal_mnesia_24 / internal_mnesia / 1544b56 pgsql_mnesia_23 / pgsql_mnesia / 1544b56 mysql_redis_24 / mysql_redis / 1544b56 pgsql_mnesia_24 / pgsql_mnesia / 1544b56 dynamic_domains_SUITE:with_mod_dynamic_domains_test:iq_handling_for_subdomain{error,
{{assertion_failed,assert,is_iq_result,
[{xmlel,<<"iq">>,
[{<<"to">>,<<"subdomain2.example.test">>},
{<<"type">>,<<"get">>},
{<<"id">>,<<"ec56d7e5396492000047c7aaf7fe8d19">>}],
[{xmlel,<<"query">>,[{<<"xmlns">>,<<"dummy.namespace">>}],[]}]}],
{xmlel,<<"iq">>,
[{<<"from">>,<<"subdomain2.example.test">>},
{<<"to">>,<<"[email protected]/res1">>},
{<<"type">>,<<"error">>},
{<<"xml:lang">>,<<"en">>},
{<<"id">>,<<"ec56d7e5396492000047c7aaf7fe8d19">>}],
[{xmlel,<<"query">>,[{<<"xmlns">>,<<"dummy.namespace">>}],[]},
{xmlel,<<"error">>,
[{<<"code">>,<<"404">>},{<<"type">>,<<"cancel">>}],
[{xmlel,<<"remote-server-not-found">>,
[{<<"xmlns">>,
<<"urn:ietf:params:xml:ns:xmpp-stanzas">>}],
[]},
{xmlel,<<"text">>,
[{<<"xmlns">>,
<<"urn:ietf:params:xml:ns:xmpp-stanzas">>}],
[{xmlcdata,<<"From s2s (waiting)">>}]}]}]},
"<iq from='subdomain2.example.test' to='[email protected]/res1' type='error' xml:lang='en' id='ec56d7e5396492000047c7aaf7fe8d19'><query xmlns='dummy.namespace'/><error code='404' type='cancel'><remote-server-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/><text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>From s2s (waiting)</text></error></iq>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/project/big_tests/_build/default...mssql_mnesia_24 / odbc_mssql_mnesia / 1544b56 riak_mnesia_24 / riak_mnesia / 1544b56 |
Codecov Report
@@ Coverage Diff @@
## tls-config-rework #3655 +/- ##
=====================================================
- Coverage 81.13% 81.12% -0.01%
=====================================================
Files 433 433
Lines 31910 31901 -9
=====================================================
- Hits 25889 25879 -10
- Misses 6021 6022 +1
Continue to review full report at Codecov.
|
- Lists should still have 'format_items = none' as default. - Remove explicit 'format_items = map' for all sections. For sections not converted yet: - Convert to maps, if this is simple. - For non-trivial cases, leave 'format_items = none' for now.
chrzaszcz
force-pushed
the
config-items-in-map
branch
from
1544b56
to
5df2660
Compare
|
small_tests_24 / small_tests / 5df2660 small_tests_23 / small_tests / 5df2660 dynamic_domains_mysql_redis_24 / mysql_redis / 5df2660 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 5df2660 dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 5df2660 ldap_mnesia_24 / ldap_mnesia / 5df2660 ldap_mnesia_23 / ldap_mnesia / 5df2660 dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 5df2660 internal_mnesia_24 / internal_mnesia / 5df2660 pgsql_mnesia_24 / pgsql_mnesia / 5df2660 elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 5df2660 pgsql_mnesia_23 / pgsql_mnesia / 5df2660 mysql_redis_24 / mysql_redis / 5df2660 pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription{error,{{badmatch,[{xmlel,<<"presence">>,
[{<<"from">>,
<<"alice_unsubscribe_after_presence_unsubscription_1870@localhost/res1">>},
{<<"to">>,
<<"bob_unsubscribe_after_presence_unsubscription_1870@localhost/res1">>},
{<<"type">>,<<"unavailable">>}],
[]}]},
[{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,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}]}]}}mssql_mnesia_24 / odbc_mssql_mnesia / 5df2660 riak_mnesia_24 / riak_mnesia / 5df2660 |
- Rename 'none' to 'list' and make it accept only lists. - Skip the 'process_items' step for options, which don't have items.
|
small_tests_24 / small_tests / 651e21a small_tests_23 / small_tests / 651e21a dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 651e21a dynamic_domains_mysql_redis_24 / mysql_redis / 651e21a dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 651e21a dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 651e21a ldap_mnesia_23 / ldap_mnesia / 651e21a internal_mnesia_24 / internal_mnesia / 651e21a pgsql_mnesia_23 / pgsql_mnesia / 651e21a pgsql_mnesia_24 / pgsql_mnesia / 651e21a elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 651e21a mysql_redis_24 / mysql_redis / 651e21a pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription{error,
{{badmatch,
[{xmlel,<<"message">>,
[{<<"from">>,
<<"alice_unsubscribe_after_presence_unsubscription_1889@localhost">>},
{<<"to">>,
<<"bob_unsubscribe_after_presence_unsubscription_1889@localhost/res1">>},
{<<"type">>,<<"headline">>}],
[{xmlel,<<"event">>,
[{<<"xmlns">>,
<<"http://jabber.org/protocol/pubsub#event">>}],
[{xmlel,<<"items">>,
[{<<"node">>,<<"6LaP9vScvhCCkERFIvReXg==">>}],
[{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,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}]}]}}mssql_mnesia_24 / odbc_mssql_mnesia / 651e21a riak_mnesia_24 / riak_mnesia / 651e21a |
Clean up item formatting:
format_items = mapby default.format_items = listby default.Remove explicit
format_items = mapfor all sections.For sections that are formatted as lists, use
format_items = list. Trivial cases are converted to maps in this PR.