C2s code cleanup #3959
C2s code cleanup #3959
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
Codecov ReportBase: 83.53% // Head: 83.51% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #3959 +/- ##
==========================================
- Coverage 83.53% 83.51% -0.03%
==========================================
Files 538 538
Lines 34003 34003
==========================================
- Hits 28406 28396 -10
- Misses 5597 5607 +10
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
chrzaszcz
force-pushed
the
c2s-code-cleanup
branch
from
53bc243
to
4bd9e89
Compare
This comment was marked as outdated.
This comment was marked as outdated.
chrzaszcz
force-pushed
the
c2s-code-cleanup
branch
from
4bd9e89
to
1bc3113
Compare
This comment was marked as outdated.
This comment was marked as outdated.
There is no check_incoming_accum_for_conflicts anymore, and this test cannot reach that functionality, because it was extracted to mod_stream_management.
There was a function called 'wait_for_registration', that called the non-existing old c2s module. It was supposed to wait for the sm session, but actually the presence is sent by the server after creating the session, not before as the comment said. Thus, it was enough to disable the filter predicate for Alice's presences, and just handle them the same way as for other users.
It is module-specific state.
chrzaszcz
force-pushed
the
c2s-code-cleanup
branch
from
1bc3113
to
cb60d77
Compare
|
small_tests_24 / small_tests / cb60d77 small_tests_25 / small_tests / cb60d77 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / cb60d77 ldap_mnesia_24 / ldap_mnesia / cb60d77 ldap_mnesia_25 / ldap_mnesia / cb60d77 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / cb60d77 dynamic_domains_mysql_redis_25 / mysql_redis / cb60d77 pgsql_mnesia_24 / pgsql_mnesia / cb60d77 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / cb60d77 riak_mnesia_24 / riak_mnesia / cb60d77 elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / cb60d77 internal_mnesia_25 / internal_mnesia / cb60d77 pgsql_mnesia_25 / pgsql_mnesia / cb60d77 mysql_redis_25 / mysql_redis / cb60d77 mssql_mnesia_25 / odbc_mssql_mnesia / cb60d77 inbox_extensions_SUITE:regular:one_to_one:pagination:can_paginate_forwards{error,
{{inbox_size,3,
[{times,1,
{error,
#{check_params => #{},error => function_clause,
expected_items =>
[#{content => <<"Msg 3">>,
from => <<"alice_can_paginate_forwards_1577@localhost/res1">>,
to => <<"mike_can_paginate_forwards_1577@localhost/res1">>,
unread => 0,verify => #Fun<inbox_helper.28.35890797>},
#{content => <<"Msg 2">>,
from => <<"alice_can_paginate_forwards_1577@localhost/res1">>,
to => <<"kate_can_paginate_forwards_1577@localhost/res1">>,
unread => 0,verify => #Fun<inbox_helper.28.35890797>},
#{content => <<"Msg 1">>,
from => <<"alice_can_paginate_forwards_1577@localhost/res1">>,
to => <<"bob_can_paginate_forwards_1577@localhost/res1">>,
unread => 0,verify => #Fun<inbox_helper.28.35890797>}],
inbox_items =>
[<<"<message from='alice_can_paginate_forwards_1577@localhost' to='alice_can_paginate_forwards_1577@localhost/res1' id='1675-927918-356703'><result xmlns='erlang-solutions.com:xmpp:inbox:0' unread='0' queryid='f938df08ec82ad423f2f731cb6e46645'><forwarded xmlns='urn:xmpp:forward:0'><delay xmlns='urn:xmpp:delay' stamp='2023-02-09T07:31:58.339253Z'/><message from='alice_can_paginate_forwards_1577@localhost/res1' to='mike_can_paginate_forwards_1577@localhost/res1' type='chat' xmlns='jabber:client'><body>Msg 3</body></message></forwarded><read>true</read><box>inbox</box><archive>false</archive><mute>0</mute></result></message>">>,
<<"<message from='alice_can_...service_mongoose_system_metrics_SUITE:system_metrics_are_reported_to_configurable_google_analytics{error,
{{assertEqual,
[{module,service_mongoose_system_metrics_SUITE},
{line,470},
{expression,"ActualTrackingIds"},
{expected,[<<"UA-151671255-1">>,<<"UA-EXTRA-TRACKING-ID">>]},
{value,[<<"UA-151671255-1">>]}]},
[{service_mongoose_system_metrics_SUITE,
events_are_reported_to_tracking_ids,1,
[{file,
"/home/circleci/project/big_tests/tests/service_mongoose_system_metrics_SUITE.erl"},
{line,470}]},
{service_mongoose_system_metrics_SUITE,
system_metrics_are_reported_to_configurable_google_analytics,1,
[{file,
"/home/circleci/project/big_tests/tests/service_mongoose_system_metrics_SUITE.erl"},
{line,204}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}mssql_mnesia_25 / odbc_mssql_mnesia / cb60d77 |
This PR cleans up some minor leftovers of the old c2s, and finishes renaming
HandlertoModState, which was done incompletely.More details in commit messages.