Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Test: Clear tables when ending a group, instead of when starting

Browse Source 
Because a group may be started but the tables are not yet created,
as they are created automatically when update_sql_schema is enabled.

This modifies commit e2b79ea
This commit is contained in:
Badlop 2024-04-15 10:42:46 +02:00
parent 599cddfb67
commit 1076f8bfc2
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/ejabberd_SUITE.erl
View File

@ -99,7 +99,6 @@ do_init_per_group(mysql, Config) ->
case catch ejabberd_sql:sql_query(?MYSQL_VHOST, [<<"select 1;">>]) of
{selected, _, _} ->
mod_muc:shutdown_rooms(?MYSQL_VHOST),
clear_sql_tables(mysql, Config),
update_sql(?MYSQL_VHOST, Config),
set_opt(server, ?MYSQL_VHOST, Config);
Err ->
@ -109,7 +108,6 @@ do_init_per_group(mssql, Config) ->
case catch ejabberd_sql:sql_query(?MSSQL_VHOST, [<<"select 1;">>]) of
{selected, _, _} ->
mod_muc:shutdown_rooms(?MSSQL_VHOST),
clear_sql_tables(mssql, Config),
update_sql(?MSSQL_VHOST, Config),
set_opt(server, ?MSSQL_VHOST, Config);
Err ->
@ -119,7 +117,6 @@ do_init_per_group(pgsql, Config) ->
case catch ejabberd_sql:sql_query(?PGSQL_VHOST, [<<"select 1;">>]) of
{selected, _, _} ->
mod_muc:shutdown_rooms(?PGSQL_VHOST),
clear_sql_tables(pgsql, Config),
update_sql(?PGSQL_VHOST, Config),
set_opt(server, ?PGSQL_VHOST, Config);
Err ->
@ -168,11 +165,34 @@ end_per_group(mnesia, _Config) ->
ok;
end_per_group(redis, _Config) ->
ok;
end_per_group(mysql, _Config) ->
end_per_group(mysql, Config) ->
Query = "SELECT COUNT(*) FROM information_schema.tables WHERE table_name = 'mqtt_pub';",
case catch ejabberd_sql:sql_query(?MYSQL_VHOST, [Query]) of
{selected, _, [[<<"0">>]]} ->
ok;
{selected, _, [[<<"1">>]]} ->
clear_sql_tables(mysql, Config);
Other ->
ct:fail({failed_to_check_table_existence, mysql, Other})
end,
ok;
end_per_group(mssql, _Config) ->
end_per_group(mssql, Config) ->
Query = "SELECT * FROM sys.tables WHERE name = 'mqtt_pub'",
case catch ejabberd_sql:sql_query(?MSSQL_VHOST, [Query]) of
{selected, [t]} ->
clear_sql_tables(mssql, Config);
Other ->
ct:fail({failed_to_check_table_existence, mssql, Other})
end,
ok;
end_per_group(pgsql, _Config) ->
end_per_group(pgsql, Config) ->
Query = "SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = 'mqtt_pub');",
case catch ejabberd_sql:sql_query(?PGSQL_VHOST, [Query]) of
{selected, [t]} ->
clear_sql_tables(pgsql, Config);
Other ->
ct:fail({failed_to_check_table_existence, pgsql, Other})
end,
ok;
end_per_group(sqlite, _Config) ->
ok;