Skip to content

Commit 12df027

Browse files
jacekwegrjacekwegr
committed
Isolate one of the failing tests
1 parent e136429 commit 12df027

File tree

2 files changed

+71
-39
lines changed

2 files changed

+71
-39
lines changed

‎big_tests/tests/s2s_SUITE.erl

Lines changed: 57 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
-include_lib("exml/include/exml_stream.hrl").
1313
-include_lib("eunit/include/eunit.hrl").
1414

15+
-include_lib("kernel/include/logger.hrl").
16+
1517
-import(distributed_helper, [mim/0, rpc_spec/1, rpc/4]).
1618
-import(domain_helper, [host_type/0]).
1719

@@ -23,60 +25,62 @@
2325

2426
all() ->
2527
[
26-
{group, both_plain},
27-
{group, both_tls_optional}, %% default MongooseIM config
28-
{group, both_tls_required},
29-
{group, both_tls_enforced},
28+
{group, both_plain}
29+
% {group, both_tls_optional}, %% default MongooseIM config
30+
% {group, both_tls_required},
31+
% {group, both_tls_enforced},
3032

31-
{group, node1_tls_optional_node2_tls_required},
32-
{group, node1_tls_required_node2_tls_optional},
33+
% {group, node1_tls_optional_node2_tls_required},
34+
% {group, node1_tls_required_node2_tls_optional},
3335

34-
{group, node1_tls_required_trusted_node2_tls_optional},
35-
{group, node1_tls_optional_node2_tls_required_trusted_with_cachain},
36+
% {group, node1_tls_required_trusted_node2_tls_optional},
37+
% {group, node1_tls_optional_node2_tls_required_trusted_with_cachain},
3638

37-
{group, node1_tls_false_node2_tls_required},
38-
{group, node1_tls_required_node2_tls_false},
39+
% {group, node1_tls_false_node2_tls_required},
40+
% {group, node1_tls_required_node2_tls_false},
3941

40-
{group, dialback}
42+
% {group, dialback}
4143
].
4244

4345
groups() ->
44-
[{both_plain, [], all_tests()},
45-
{both_tls_optional, [], essentials()},
46-
{both_tls_required, [], essentials()},
47-
{both_tls_enforced, [], essentials()},
46+
[{both_plain, [], all_tests()}
47+
% {both_tls_optional, [], essentials()},
48+
% {both_tls_required, [], essentials()},
49+
% {both_tls_enforced, [], essentials()},
4850

49-
{node1_tls_optional_node2_tls_required, [], essentials()},
50-
{node1_tls_required_node2_tls_optional, [], essentials()},
51+
% {node1_tls_optional_node2_tls_required, [], essentials()},
52+
% {node1_tls_required_node2_tls_optional, [], essentials()},
5153

52-
%% Node1 closes connection from nodes with invalid certs
53-
{node1_tls_required_trusted_node2_tls_optional, [], negative()},
54+
% %% Node1 closes connection from nodes with invalid certs
55+
% {node1_tls_required_trusted_node2_tls_optional, [], negative()},
5456

55-
%% Node1 accepts connection provided the cert can be verified
56-
{node1_tls_optional_node2_tls_required_trusted_with_cachain, [parallel],
57-
essentials() ++ connection_cases() ++ start_stream_error_groups()},
57+
% %% Node1 accepts connection provided the cert can be verified
58+
% {node1_tls_optional_node2_tls_required_trusted_with_cachain, [parallel],
59+
% essentials() ++ connection_cases() ++ start_stream_error_groups()},
5860

59-
{node1_tls_false_node2_tls_required, [], negative()},
60-
{node1_tls_required_node2_tls_false, [], negative()},
61-
{dialback, [], [dialback_key_is_synchronized_on_different_nodes]},
61+
% {node1_tls_false_node2_tls_required, [], negative()},
62+
% {node1_tls_required_node2_tls_false, [], negative()},
63+
% {dialback, [], [dialback_key_is_synchronized_on_different_nodes]},
6264

63-
{start_stream_errors, [parallel], start_stream_error_cases()},
64-
{start_stream_errors_after_starttls, [parallel], start_stream_error_cases()},
65-
{start_stream_errors_after_auth, [parallel], start_stream_error_cases()}
65+
% {start_stream_errors, [parallel], start_stream_error_cases()},
66+
% {start_stream_errors_after_starttls, [parallel], start_stream_error_cases()},
67+
% {start_stream_errors_after_auth, [parallel], start_stream_error_cases()}
6668
].
6769

6870
essentials() ->
6971
[simple_message].
7072

7173
all_tests() ->
72-
[connections_info,
73-
dns_srv_discovery,
74-
dns_ip_discovery,
75-
dns_discovery_fail,
76-
nonexistent_user,
77-
unknown_domain,
78-
malformed_jid,
79-
dialback_with_wrong_key].
74+
[
75+
% connections_info,
76+
% dns_srv_discovery,
77+
dns_ip_discovery
78+
% dns_discovery_fail,
79+
% nonexistent_user,
80+
% unknown_domain,
81+
% malformed_jid,
82+
% dialback_with_wrong_key
83+
].
8084

8185
negative() ->
8286
[timeout_waiting_for_message].
@@ -108,7 +112,7 @@ suite() ->
108112
%%%===================================================================
109113

110114
init_per_suite(Config0) ->
111-
ct:pal("Tested events: ~p~n", [tested_events()]),
115+
?LOG_WARNING("Tested events: ~p~n", [tested_events()]),
112116
instrument_helper:start(tested_events()),
113117
mongoose_helper:inject_module(?MODULE, reload),
114118
Config1 = escalus:init_per_suite(Config0),
@@ -161,34 +165,49 @@ init_per_testcase(CaseName, Config) ->
161165
escalus:init_per_testcase(CaseName, Config).
162166

163167
meck_dns_srv_lookup(Domain, Which) ->
168+
?LOG_WARNING("meck_dns_srv_lookup"),
164169
FedPort = ct:get_config({hosts, fed, incoming_s2s_port}),
165170
ok = rpc(mim(), meck, new, [inet_res, [no_link, unstick, passthrough]]),
166171
ok = rpc(mim(), meck, expect, [inet_res, lookup, inet_res_lookup_fun(Domain, FedPort, Which)]).
167172

168173
inet_res_lookup_fun(Domain, FedPort, srv_ssl) ->
169174
fun("_xmpps-server._tcp." ++ Domain1, in, srv, _Opts, _Timeout) when Domain1 =:= Domain ->
175+
?LOG_WARNING("srv_ssl - meck"),
170176
[{30, 0, FedPort, "localhost"}];
171177
(Name, Class, Type, Opts, Timeout) ->
178+
?LOG_WARNING("srv_ssl - passthrough"),
172179
meck:passthrough([Name, Class, Type, Opts, Timeout])
173180
end;
174181
inet_res_lookup_fun(Domain, FedPort, srv) ->
175182
fun("_xmpp-server._tcp." ++ Domain1, in, srv, _Opts, _Timeout) when Domain1 =:= Domain ->
183+
?LOG_WARNING("srv - meck"),
176184
[{30, 0, FedPort, "localhost"}];
177185
(Name, Class, Type, Opts, Timeout) ->
186+
?LOG_WARNING("srv - passthrough"),
178187
meck:passthrough([Name, Class, Type, Opts, Timeout])
179188
end;
180189
inet_res_lookup_fun(Domain, _FedPort, ip) ->
181190
fun(Domain1, in, a, _Opts, _Timeout) when Domain1 =:= Domain ->
191+
?LOG_WARNING("ip - meck"),
182192
[{127, 0, 0, 1}];
183193
(Name, Class, Type, Opts, Timeout) ->
194+
% ?LOG_WARNING("ip - passthrough"),
195+
% ?LOG_WARNING("Name: ~p", [Name]),
196+
% ?LOG_WARNING("Class: ~p", [Class]),
197+
% ?LOG_WARNING("Type: ~p", [Type]),
198+
% ?LOG_WARNING("Opts: ~p", [Opts]),
199+
% ?LOG_WARNING("Timeout: ~p", [Timeout]),
184200
meck:passthrough([Name, Class, Type, Opts, Timeout])
185201
end;
186202
inet_res_lookup_fun(Domain, _FedPort, none) ->
187203
fun("_xmpp-server._tcp." ++ Domain1, in, srv, _Opts, _Timeout) when Domain1 =:= Domain ->
204+
?LOG_WARNING("none - meck - srv"),
188205
{error, nxdomain};
189206
(Domain1, in, inet, _Opts, _Timeout) when Domain1 =:= Domain ->
207+
?LOG_WARNING("none - meck - inet"),
190208
{error, nxdomain};
191209
(Name, Class, Type, Opts, Timeout) ->
210+
?LOG_WARNING("none - passthrough"),
192211
meck:passthrough([Name, Class, Type, Opts, Timeout])
193212
end.
194213

@@ -296,7 +315,7 @@ get_s2s_connections(RPCSpec, Domain, Type) ->
296315
[Connection || Connection <- AllS2SConnections,
297316
Type =/= in orelse [Domain] =:= maps:get(domains, Connection),
298317
Type =/= out orelse Domain =:= maps:get(server, Connection)],
299-
ct:pal("Node = ~p, ConnectionType = ~p, Domain = ~s~nDomainS2SConnections(~p): ~p~nAll Connections: ~p",
318+
?LOG_WARNING("Node = ~p, ConnectionType = ~p, Domain = ~s~nDomainS2SConnections(~p): ~p~nAll Connections: ~p",
300319
[maps:get(node, RPCSpec), Type, Domain, length(DomainS2SConnections),
301320
DomainS2SConnections, AllS2SConnections]),
302321
DomainS2SConnections.

‎src/mongoose_addr_list.erl

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,17 @@ lookup_services(HostType, Domain, EnforceTls) ->
8181
lookup_addrs(HostType, Domain, EnforceTls) ->
8282
Port = outgoing_s2s_port(HostType),
8383
Types = outgoing_s2s_types(HostType),
84+
?LOG_WARNING("---------START lookup_addrs-------------"),
8485
Fun = fun(Type) ->
8586
MaybeHostEnt = dns_lookup(HostType, Domain, Type),
86-
prepare_addr(MaybeHostEnt, Port, EnforceTls, Domain, Type)
87+
?LOG_WARNING("MaybeHostEnt: ~p", [MaybeHostEnt]),
88+
Res = prepare_addr(MaybeHostEnt, Port, EnforceTls, Domain, Type),
89+
?LOG_WARNING("prepare_addr - res: ~p", [Res]),
90+
Res
8791
end,
8892
Expanded = lists:map(Fun, Types),
93+
?LOG_WARNING("lists:flatten(Expanded): ~p", [lists:flatten(Expanded)]),
94+
?LOG_WARNING("---------END lookup_addrs-------------"),
8995
lists:flatten(Expanded).
9096

9197
-spec ensure_tls_and_port(mongooseim:host_type(), pre_addr(), with_tls()) -> [addr()].
@@ -262,6 +268,13 @@ dns_lookup(HostType, Domain, DnsRrType) ->
262268
dns_lookup(_Domain, _DnsRrType, _, 0) ->
263269
[];
264270
dns_lookup(Domain, DnsRrType, Timeout, Retries) ->
271+
?LOG_WARNING("------------~n"),
272+
?LOG_WARNING("inet ~p", [inet:get_rc()]),
273+
?LOG_WARNING("Domain ~p", [Domain]),
274+
?LOG_WARNING("DnsRrType ~p", [DnsRrType]),
275+
?LOG_WARNING("Timeout ~p", [Timeout]),
276+
?LOG_WARNING("Retries ~p", [Retries]),
277+
?LOG_WARNING("------------~n"),
265278
case inet_res:lookup(Domain, in, DnsRrType, [], Timeout) of
266279
[_|_] = List ->
267280
List;

0 commit comments

Comments
 (0)