Skip to content

Commit 59867fc

Browse files
vkatsubavkatsuba
committed
Mnesia migration: CT - for debug failed tests ONLY
1 parent edaddc0 commit 59867fc

File tree

4 files changed

+128
-122
lines changed

4 files changed

+128
-122
lines changed

‎.travis.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ env:
9090
- PRESET=small_tests RUN_SMALL_TESTS=true SKIP_RELEASE=1 SKIP_BUILD_TESTS=1
9191
- PRESET=internal_mnesia DB="mnesia minio" REL_CONFIG="with-all" TLS_DIST=true
9292
- PRESET=odbc_mssql_mnesia DB=mssql REL_CONFIG="with-odbc"
93-
- PRESET=mysql_redis DB=mysql REL_CONFIG="with-mysql with-redis with-amqp_client"
94-
- PRESET=riak_mnesia DB=riak REL_CONFIG="with-riak"
95-
- PRESET=ldap_mnesia DB=mnesia REL_CONFIG="with-none"
96-
- PRESET=elasticsearch_and_cassandra_mnesia DB="elasticsearch cassandra"
97-
REL_CONFIG="with-elasticsearch with-cassandra" TESTSPEC=mam.spec
98-
ELASTICSEARCH_VERSION=5.6.9 CASSANDRA_VERSION=3.9
99-
- PRESET=dialyzer_only SKIP_RELEASE=1 SKIP_BUILD_TESTS=1 SKIP_COV=1 SKIP_REPORT_UPLOAD=1
93+
#- PRESET=mysql_redis DB=mysql REL_CONFIG="with-mysql with-redis with-amqp_client"
94+
#- PRESET=riak_mnesia DB=riak REL_CONFIG="with-riak"
95+
#- PRESET=ldap_mnesia DB=mnesia REL_CONFIG="with-none"
96+
#- PRESET=elasticsearch_and_cassandra_mnesia DB="elasticsearch cassandra"
97+
# REL_CONFIG="with-elasticsearch with-cassandra" TESTSPEC=mam.spec
98+
# ELASTICSEARCH_VERSION=5.6.9 CASSANDRA_VERSION=3.9
99+
#- PRESET=dialyzer_only SKIP_RELEASE=1 SKIP_BUILD_TESTS=1 SKIP_COV=1 SKIP_REPORT_UPLOAD=1
100100
# In case you want to test with another ODBC driver, uncomment this
101101
# - PRESET=odbc_pgsql_mnesia DB=pgsql REL_CONFIG=with-odbc
102102

@@ -105,14 +105,14 @@ matrix:
105105
include:
106106
- otp_release: 22.3
107107
env: PRESET=pgsql_mnesia DB=pgsql REL_CONFIG="with-pgsql" RUN_SMALL_TESTS=true
108-
- language: generic
109-
env: PRESET=pkg pkg_PLATFORM=centos_7
110-
SKIP_COMPILE=1 SKIP_RELEASE=1 SKIP_BUILD_TESTS=1 ESL_ERLANG_PKG_VER=22.1.8-2
111-
SKIP_COV=1 SKIP_REPORT_UPLOAD=1
112-
- language: generic
113-
env: PRESET=pkg pkg_PLATFORM=debian_stretch ESL_ERLANG_PKG_VER=22.1.8-1
114-
SKIP_COMPILE=1 SKIP_RELEASE=1 SKIP_BUILD_TESTS=1
115-
SKIP_COV=1 SKIP_REPORT_UPLOAD=1
108+
#- language: generic
109+
# env: PRESET=pkg pkg_PLATFORM=centos_7
110+
# SKIP_COMPILE=1 SKIP_RELEASE=1 SKIP_BUILD_TESTS=1 ESL_ERLANG_PKG_VER=22.1.8-2
111+
# SKIP_COV=1 SKIP_REPORT_UPLOAD=1
112+
#- language: generic
113+
# env: PRESET=pkg pkg_PLATFORM=debian_stretch ESL_ERLANG_PKG_VER=22.1.8-1
114+
# SKIP_COMPILE=1 SKIP_RELEASE=1 SKIP_BUILD_TESTS=1
115+
# SKIP_COV=1 SKIP_REPORT_UPLOAD=1
116116

117117
notifications:
118118
webhooks:

‎big_tests/default.spec‎

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -11,79 +11,80 @@
1111
%% do not remove below SUITE if testing mongoose
1212
{suites, "tests", mongoose_sanity_checks_SUITE}.
1313

14-
{suites, "tests", acc_e2e_SUITE}.
15-
{suites, "tests", accounts_SUITE}.
16-
{suites, "tests", adhoc_SUITE}.
17-
{suites, "tests", amp_big_SUITE}.
18-
{suites, "tests", anonymous_SUITE}.
19-
{suites, "tests", bosh_SUITE}.
20-
{suites, "tests", carboncopy_SUITE}.
21-
{suites, "tests", cluster_commands_SUITE}.
22-
{suites, "tests", component_SUITE}.
23-
{suites, "tests", conf_reload_SUITE}.
24-
{suites, "tests", config_format_SUITE}.
25-
{suites, "tests", connect_SUITE}.
26-
{suites, "tests", disco_and_caps_SUITE}.
27-
{suites, "tests", ejabberdctl_SUITE}.
28-
{suites, "tests", extdisco_SUITE}.
29-
{suites, "tests", gdpr_SUITE}.
30-
{suites, "tests", inbox_SUITE}.
31-
{suites, "tests", jingle_SUITE}.
32-
{suites, "tests", last_SUITE}.
33-
{suites, "tests", login_SUITE}.
34-
{suites, "tests", mam_SUITE}.
35-
{suites, "tests", metrics_api_SUITE}.
36-
{suites, "tests", metrics_c2s_SUITE}.
37-
{suites, "tests", metrics_register_SUITE}.
38-
{suites, "tests", metrics_roster_SUITE}.
39-
{suites, "tests", metrics_session_SUITE}.
40-
{suites, "tests", mod_aws_sns_SUITE}.
41-
{suites, "tests", mod_blocking_SUITE}.
42-
{suites, "tests", mod_event_pusher_rabbit_SUITE}.
43-
{suites, "tests", mod_event_pusher_http_SUITE}.
44-
{suites, "tests", mod_global_distrib_SUITE}.
45-
{suites, "tests", mod_http_upload_SUITE}.
46-
{suites, "tests", mod_ping_SUITE}.
47-
{suites, "tests", mod_time_SUITE}.
48-
{suites, "tests", mod_version_SUITE}.
49-
{suites, "tests", mongoose_cassandra_SUITE}.
50-
{suites, "tests", mongoose_elasticsearch_SUITE}.
51-
{suites, "tests", muc_SUITE}.
52-
{suites, "tests", muc_http_api_SUITE}.
53-
{suites, "tests", muc_light_SUITE}.
54-
{suites, "tests", muc_light_http_api_SUITE}.
55-
{suites, "tests", muc_light_legacy_SUITE}.
56-
{suites, "tests", oauth_SUITE}.
57-
{suites, "tests", offline_SUITE}.
58-
{suites, "tests", pep_SUITE}.
59-
{suites, "tests", persistent_cluster_id_SUITE}.
60-
{suites, "tests", presence_SUITE}.
61-
{suites, "tests", privacy_SUITE}.
62-
{suites, "tests", private_SUITE}.
63-
{suites, "tests", pubsub_SUITE}.
64-
{suites, "tests", pubsub_s2s_SUITE}.
65-
{suites, "tests", push_SUITE}.
66-
{suites, "tests", push_http_SUITE}.
67-
{suites, "tests", push_integration_SUITE}.
68-
{suites, "tests", push_pubsub_SUITE}.
69-
{suites, "tests", race_conditions_SUITE}.
70-
{suites, "tests", rdbms_SUITE}.
71-
{suites, "tests", rest_SUITE}.
72-
{suites, "tests", rest_client_SUITE}.
73-
{suites, "tests", s2s_SUITE}.
74-
{suites, "tests", sasl_SUITE}.
75-
{suites, "tests", sasl_external_SUITE}.
76-
{suites, "tests", service_mongoose_system_metrics_SUITE}.
77-
{suites, "tests", shared_roster_SUITE}.
78-
{suites, "tests", sic_SUITE}.
79-
{suites, "tests", sm_SUITE}.
80-
{suites, "tests", users_api_SUITE}.
81-
{suites, "tests", vcard_SUITE}.
82-
{suites, "tests", vcard_simple_SUITE}.
83-
{suites, "tests", websockets_SUITE}.
84-
{suites, "tests", xep_0352_csi_SUITE}.
8514
{suites, "tests", mnesia_migration_SUITE}.
8615

16+
%{suites, "tests", acc_e2e_SUITE}.
17+
%{suites, "tests", accounts_SUITE}.
18+
%{suites, "tests", adhoc_SUITE}.
19+
%{suites, "tests", amp_big_SUITE}.
20+
%{suites, "tests", anonymous_SUITE}.
21+
%{suites, "tests", bosh_SUITE}.
22+
%{suites, "tests", carboncopy_SUITE}.
23+
%{suites, "tests", cluster_commands_SUITE}.
24+
%{suites, "tests", component_SUITE}.
25+
%{suites, "tests", conf_reload_SUITE}.
26+
%{suites, "tests", config_format_SUITE}.
27+
%{suites, "tests", connect_SUITE}.
28+
%{suites, "tests", disco_and_caps_SUITE}.
29+
%{suites, "tests", ejabberdctl_SUITE}.
30+
%{suites, "tests", extdisco_SUITE}.
31+
%{suites, "tests", gdpr_SUITE}.
32+
%{suites, "tests", inbox_SUITE}.
33+
%{suites, "tests", jingle_SUITE}.
34+
%{suites, "tests", last_SUITE}.
35+
%{suites, "tests", login_SUITE}.
36+
%{suites, "tests", mam_SUITE}.
37+
%{suites, "tests", metrics_api_SUITE}.
38+
%{suites, "tests", metrics_c2s_SUITE}.
39+
%{suites, "tests", metrics_register_SUITE}.
40+
%{suites, "tests", metrics_roster_SUITE}.
41+
%{suites, "tests", metrics_session_SUITE}.
42+
%{suites, "tests", mod_aws_sns_SUITE}.
43+
%{suites, "tests", mod_blocking_SUITE}.
44+
%{suites, "tests", mod_event_pusher_rabbit_SUITE}.
45+
%{suites, "tests", mod_event_pusher_http_SUITE}.
46+
%{suites, "tests", mod_global_distrib_SUITE}.
47+
%{suites, "tests", mod_http_upload_SUITE}.
48+
%{suites, "tests", mod_ping_SUITE}.
49+
%{suites, "tests", mod_time_SUITE}.
50+
%{suites, "tests", mod_version_SUITE}.
51+
%{suites, "tests", mongoose_cassandra_SUITE}.
52+
%{suites, "tests", mongoose_elasticsearch_SUITE}.
53+
%{suites, "tests", muc_SUITE}.
54+
%{suites, "tests", muc_http_api_SUITE}.
55+
%{suites, "tests", muc_light_SUITE}.
56+
%{suites, "tests", muc_light_http_api_SUITE}.
57+
%{suites, "tests", muc_light_legacy_SUITE}.
58+
%{suites, "tests", oauth_SUITE}.
59+
%{suites, "tests", offline_SUITE}.
60+
%{suites, "tests", pep_SUITE}.
61+
%{suites, "tests", persistent_cluster_id_SUITE}.
62+
%{suites, "tests", presence_SUITE}.
63+
%{suites, "tests", privacy_SUITE}.
64+
%{suites, "tests", private_SUITE}.
65+
%{suites, "tests", pubsub_SUITE}.
66+
%{suites, "tests", pubsub_s2s_SUITE}.
67+
%{suites, "tests", push_SUITE}.
68+
%{suites, "tests", push_http_SUITE}.
69+
%{suites, "tests", push_integration_SUITE}.
70+
%{suites, "tests", push_pubsub_SUITE}.
71+
%{suites, "tests", race_conditions_SUITE}.
72+
%{suites, "tests", rdbms_SUITE}.
73+
%{suites, "tests", rest_SUITE}.
74+
%{suites, "tests", rest_client_SUITE}.
75+
%{suites, "tests", s2s_SUITE}.
76+
%{suites, "tests", sasl_SUITE}.
77+
%{suites, "tests", sasl_external_SUITE}.
78+
%{suites, "tests", service_mongoose_system_metrics_SUITE}.
79+
%{suites, "tests", shared_roster_SUITE}.
80+
%{suites, "tests", sm_SUITE}.
81+
%{suites, "tests", sic_SUITE}.
82+
%{suites, "tests", users_api_SUITE}.
83+
%{suites, "tests", vcard_SUITE}.
84+
%{suites, "tests", vcard_simple_SUITE}.
85+
%{suites, "tests", websockets_SUITE}.
86+
%{suites, "tests", xep_0352_csi_SUITE}.
87+
8788
{config, ["test.config"]}.
8889
{logdir, "ct_report"}.
8990

‎big_tests/tests/mnesia_migration_SUITE.erl‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ end_per_testcase(CaseName, Config) ->
113113
%%% ==================================================================
114114

115115
migrate_pubsub_nodes(_Config) ->
116-
Nidx = create_migration_node(),
116+
_ = create_migration_node(),
117117
{ok, _} = ?RPC_MIGRATE(<<"pubsub_nodes">>),
118118
SqlData = #{table => <<"pubsub_nodes">>, where => <<"name='", ?NODE_NAME/binary, "'">>},
119-
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"nidx">>}) of
120-
{selected, [{Nidx}]} ->
119+
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"name">>}) of
120+
{selected, [{?NODE_NAME}]} ->
121121
{updated, 1} = sql_to_rdbms(SqlData#{act => <<"DELETE">>, column => <<"">>}),
122122
_ = clear_tables(),
123-
ct:comment("Migration of 'pubsub_nodes' is successful for Nidx: ~p", [Nidx]);
123+
ct:comment("Migration of 'pubsub_nodes' is successful for 'name': ~p", [?NODE_NAME]);
124124
Any ->
125125
ct:fail("Unexpected result of 'pubsub_nodes' migration ~p~n", [Any])
126126
end.
@@ -133,12 +133,12 @@ migrate_pubsub_subscriptions(_Config) ->
133133
Nidx = create_migration_node(),
134134
ok = mongoose_helper:successful_rpc(mod_pubsub_db_mnesia, transaction, [#{name => add_subscription, args => [Nidx, ?JID, 'subscribed', <<"0000-0000-0000000">>, []]}]),
135135
{ok, _} = ?RPC_MIGRATE(<<"pubsub_subscriptions">>),
136-
SqlData = #{table => <<"pubsub_subscriptions">>, where => <<"nidx=", (list_to_binary(integer_to_list(Nidx)))/binary>>},
137-
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"nidx">>}) of
138-
{selected, [{Nidx}]} ->
136+
SqlData = #{table => <<"pubsub_subscriptions">>, where => <<"luser='", ?USERNAME/binary, "'">>},
137+
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"luser">>}) of
138+
{selected, [{?USERNAME}]} ->
139139
{updated, 1} = sql_to_rdbms(SqlData#{act => <<"DELETE">>, column => <<"">>}),
140140
_ = clear_tables(),
141-
ct:comment("Migration of 'pubsub_subscriptions' is successful for Nidx: ~p", [Nidx]);
141+
ct:comment("Migration of 'pubsub_subscriptions' is successful for 'luser': ~p", [?USERNAME]);
142142
Any ->
143143
ct:fail("Unexpected result of 'pubsub_subscriptions' migration ~p~n", [Any])
144144
end.
@@ -148,14 +148,14 @@ migrate_pubsub_subscriptions(_Config) ->
148148
%%% ==================================================================
149149

150150
migrate_pubsub_affiliations(_Config) ->
151-
Nidx = create_migration_node(),
151+
_ = create_migration_node(),
152152
{ok, _} = ?RPC_MIGRATE(<<"pubsub_affiliations">>),
153-
SqlData = #{table => <<"pubsub_affiliations">>, where => <<"nidx=", (list_to_binary(integer_to_list(Nidx)))/binary>>},
154-
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"nidx">>}) of
155-
{selected, [{Nidx}]} ->
153+
SqlData = #{table => <<"pubsub_affiliations">>, where => <<"luser='", ?USERNAME/binary, "'">>},
154+
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"luser">>}) of
155+
{selected, [{?USERNAME}]} ->
156156
{updated, 1} = sql_to_rdbms(SqlData#{act => <<"DELETE">>, column => <<"">>}),
157157
_ = clear_tables(),
158-
ct:comment("Migration of 'pubsub_affiliations' is successful for Nidx: ~p", [Nidx]);
158+
ct:comment("Migration of 'pubsub_affiliations' is successful for 'pubsub_affiliations': ~p", [?USERNAME]);
159159
Any ->
160160
ct:fail("Unexpected result of 'pubsub_affiliations' migration ~p~n", [Any])
161161
end.
@@ -168,12 +168,12 @@ migrate_pubsub_items(_Config) ->
168168
Nidx = create_migration_node(),
169169
ok = mongoose_helper:successful_rpc(mod_pubsub_db_mnesia, transaction, [#{name => add_item, args => [Nidx, ?JID, ?BASE_ITEM(Nidx)]}]),
170170
{ok, _} = ?RPC_MIGRATE(<<"pubsub_items">>),
171-
SqlData = #{table => <<"pubsub_items">>, where => <<"nidx=", (list_to_binary(integer_to_list(Nidx)))/binary>>},
172-
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"nidx">>}) of
173-
{selected, [{Nidx}]} ->
171+
SqlData = #{table => <<"pubsub_items">>, where => <<"created_luser='", ?USERNAME/binary, "'">>},
172+
case sql_to_rdbms(SqlData#{act => <<"SELECT">>, column => <<"created_luser">>}) of
173+
{selected, [{?USERNAME}]} ->
174174
{updated, 1} = sql_to_rdbms(SqlData#{act => <<"DELETE">>, column => <<"">>}),
175175
_ = clear_tables(),
176-
ct:comment("Migration of 'pubsub_items' is successful for Nidx: ~p", [Nidx]);
176+
ct:comment("Migration of 'pubsub_items' is successful for 'created_luser': ~p", [?USERNAME]);
177177
Any ->
178178
ct:fail("Unexpected result of 'pubsub_items' migration ~p~n", [Any])
179179
end.
@@ -216,7 +216,7 @@ migrate_vcard_search(_Config) ->
216216
%%% Test case for migrate vcard
217217
%%% ==================================================================
218218

219-
migrate_vcard(Config) ->
219+
migrate_vcard(_Config) ->
220220
ok = set_vcard(),
221221
{ok, _} = ?RPC_MIGRATE(<<"vcard">>),
222222
SqlData = #{table => <<"vcard">>, where => <<"username='", ?USERNAME/binary, "'">>},
@@ -233,7 +233,7 @@ migrate_vcard(Config) ->
233233
%%% Test case for migrate event_pusher_push_subscription
234234
%%% ==================================================================
235235

236-
migrate_event_pusher_push_subscription(Config) ->
236+
migrate_event_pusher_push_subscription(_Config) ->
237237
PubsubNode = <<"migration_pub_sub_node">>,
238238
ok = mongoose_helper:successful_rpc(mod_event_pusher_push_mnesia, enable, [?JID, ?JID, PubsubNode, [{<<"name">>, <<"value">>}]]),
239239
{ok, _} = ?RPC_MIGRATE(<<"event_pusher_push_subscription">>),
@@ -251,63 +251,63 @@ migrate_event_pusher_push_subscription(Config) ->
251251
%%% Test case for migrate rosterusers @TODO
252252
%%% ==================================================================
253253

254-
migrate_rosterusers(Config) ->
254+
migrate_rosterusers(_Config) ->
255255
?RPC_MIGRATE(<<"rosterusers">>),
256256
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
257257

258258
%%% ==================================================================
259259
%%% Test case for migrate roster_version @TODO
260260
%%% ==================================================================
261261

262-
migrate_roster_version(Config) ->
262+
migrate_roster_version(_Config) ->
263263
?RPC_MIGRATE(<<"roster_version">>),
264264
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
265265

266266
%%% ==================================================================
267267
%%% Test case for migrate rostergroups @TODO
268268
%%% ==================================================================
269269

270-
migrate_rostergroups(Config) ->
270+
migrate_rostergroups(_Config) ->
271271
?RPC_MIGRATE(<<"rostergroups">>),
272272
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
273273

274274
%%% ==================================================================
275275
%%% Test case for migrate last @TODO
276276
%%% ==================================================================
277277

278-
migrate_last(Config) ->
278+
migrate_last(_Config) ->
279279
?RPC_MIGRATE(<<"last">>),
280280
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
281281

282282
%%% ==================================================================
283283
%%% Test case for migrate private_storage @TODO
284284
%%% ==================================================================
285285

286-
migrate_private_storage(Config) ->
286+
migrate_private_storage(_Config) ->
287287
?RPC_MIGRATE(<<"private_storage">>),
288288
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
289289

290290
%%% ==================================================================
291291
%%% Test case for migrate offline_message @TODO
292292
%%% ==================================================================
293293

294-
migrate_offline_message(Config) ->
294+
migrate_offline_message(_Config) ->
295295
?RPC_MIGRATE(<<"offline_message">>),
296296
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
297297

298298
%%% ==================================================================
299299
%%% Test case for migrate muc_light_rooms @TODO
300300
%%% ==================================================================
301301

302-
migrate_muc_light_rooms(Config) ->
302+
migrate_muc_light_rooms(_Config) ->
303303
?RPC_MIGRATE(<<"muc_light_rooms">>),
304304
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
305305

306306
%%% ==================================================================
307307
%%% Test case for migrate all @TODO
308308
%%% ==================================================================
309309

310-
migrate_all(Config) ->
310+
migrate_all(_Config) ->
311311
?RPC_MIGRATE(<<"all">>),
312312
ct:comment("TEST CASE ~p", [?FUNCTION_NAME]).
313313

@@ -331,7 +331,7 @@ slow_rpc(M, F, A) ->
331331

332332
sql_to_rdbms(#{act := Act, column := Column, table := Table, where := Where}) ->
333333
SelectQuery = <<Act/binary, " ", Column/binary, " FROM ", Table/binary, " WHERE ", Where/binary>>,
334-
SelectResult = sql_query(SelectQuery).
334+
sql_query(SelectQuery).
335335

336336
clear_tables() ->
337337
Tables = [pubsub_state, pubsub_item, pubsub_node,

0 commit comments

Comments
 (0)