|
23 | 23 |
|
24 | 24 | all() ->
|
25 | 25 | [
|
26 |
| - {group, both_plain}, |
27 |
| - {group, both_tls_optional}, %% default MongooseIM config |
28 |
| - {group, both_tls_required}, |
29 |
| - {group, both_tls_enforced}, |
| 26 | + {group, both_plain} |
| 27 | + % {group, both_tls_optional}, %% default MongooseIM config |
| 28 | + % {group, both_tls_required}, |
| 29 | + % {group, both_tls_enforced}, |
30 | 30 |
|
31 |
| - {group, node1_tls_optional_node2_tls_required}, |
32 |
| - {group, node1_tls_required_node2_tls_optional}, |
| 31 | + % {group, node1_tls_optional_node2_tls_required}, |
| 32 | + % {group, node1_tls_required_node2_tls_optional}, |
33 | 33 |
|
34 |
| - {group, node1_tls_required_trusted_node2_tls_optional}, |
35 |
| - {group, node1_tls_optional_node2_tls_required_trusted_with_cachain}, |
| 34 | + % {group, node1_tls_required_trusted_node2_tls_optional}, |
| 35 | + % {group, node1_tls_optional_node2_tls_required_trusted_with_cachain}, |
36 | 36 |
|
37 |
| - {group, node1_tls_false_node2_tls_required}, |
38 |
| - {group, node1_tls_required_node2_tls_false}, |
| 37 | + % {group, node1_tls_false_node2_tls_required}, |
| 38 | + % {group, node1_tls_required_node2_tls_false}, |
39 | 39 |
|
40 |
| - {group, dialback} |
| 40 | + % {group, dialback} |
41 | 41 | ].
|
42 | 42 |
|
43 | 43 | groups() ->
|
44 |
| - [{both_plain, [], all_tests()}, |
45 |
| - {both_tls_optional, [], essentials()}, |
46 |
| - {both_tls_required, [], essentials()}, |
47 |
| - {both_tls_enforced, [], essentials()}, |
| 44 | + [{both_plain, [], all_tests()} |
| 45 | + % {both_tls_optional, [], essentials()}, |
| 46 | + % {both_tls_required, [], essentials()}, |
| 47 | + % {both_tls_enforced, [], essentials()}, |
48 | 48 |
|
49 |
| - {node1_tls_optional_node2_tls_required, [], essentials()}, |
50 |
| - {node1_tls_required_node2_tls_optional, [], essentials()}, |
| 49 | + % {node1_tls_optional_node2_tls_required, [], essentials()}, |
| 50 | + % {node1_tls_required_node2_tls_optional, [], essentials()}, |
51 | 51 |
|
52 |
| - %% Node1 closes connection from nodes with invalid certs |
53 |
| - {node1_tls_required_trusted_node2_tls_optional, [], negative()}, |
| 52 | + % %% Node1 closes connection from nodes with invalid certs |
| 53 | + % {node1_tls_required_trusted_node2_tls_optional, [], negative()}, |
54 | 54 |
|
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()}, |
| 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()}, |
58 | 58 |
|
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]}, |
| 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]}, |
62 | 62 |
|
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()} |
| 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()} |
66 | 66 | ].
|
67 | 67 |
|
68 | 68 | essentials() ->
|
69 | 69 | [simple_message].
|
70 | 70 |
|
71 | 71 | 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]. |
| 72 | + [ |
| 73 | + % connections_info, |
| 74 | + % dns_srv_discovery, |
| 75 | + dns_ip_discovery |
| 76 | + % dns_discovery_fail, |
| 77 | + % nonexistent_user, |
| 78 | + % unknown_domain, |
| 79 | + % malformed_jid, |
| 80 | + % dialback_with_wrong_key |
| 81 | + ]. |
80 | 82 |
|
81 | 83 | negative() ->
|
82 | 84 | [timeout_waiting_for_message].
|
@@ -213,14 +215,14 @@ simple_message(Config) ->
|
213 | 215 | escalus:send(Alice1, escalus_stanza:chat_to(Alice2, <<"Hi, foreign Alice!">>)),
|
214 | 216 |
|
215 | 217 | %% User on the federated server receives the message
|
216 |
| - Stanza = escalus:wait_for_stanza(Alice2, 5000), |
| 218 | + Stanza = escalus:wait_for_stanza(Alice2, 20000), |
217 | 219 | escalus:assert(is_chat_message, [<<"Hi, foreign Alice!">>], Stanza),
|
218 | 220 |
|
219 | 221 | %% User on the federated server sends a message to the main server
|
220 | 222 | escalus:send(Alice2, escalus_stanza:chat_to(Alice1, <<"Nice to meet you!">>)),
|
221 | 223 |
|
222 | 224 | %% User on the main server receives the message
|
223 |
| - Stanza2 = escalus:wait_for_stanza(Alice1, 5000), |
| 225 | + Stanza2 = escalus:wait_for_stanza(Alice1, 20000), |
224 | 226 | escalus:assert(is_chat_message, [<<"Nice to meet you!">>], Stanza2),
|
225 | 227 |
|
226 | 228 | % Instrumentation events are executed
|
|
0 commit comments