diff --git a/test/box-luatest/gh_4264_recursive_trigger_test.lua b/test/box-luatest/gh_4264_recursive_trigger_test.lua
index 93e648ad6bccc60548bb09d41d6a1d3c2b62f378..36ab131fcbb9cc74d9ad1980afc51525804ba0a1 100644
--- a/test/box-luatest/gh_4264_recursive_trigger_test.lua
+++ b/test/box-luatest/gh_4264_recursive_trigger_test.lua
@@ -73,7 +73,7 @@ g2.before_test('test_on_shutdown_trigger_clear', function(cg)
end)
g2.after_test('test_on_shutdown_trigger_clear', function(cg)
- cg.server:clean()
+ cg.server:drop()
end)
g2.test_on_shutdown_trigger_clear = function(cg)
diff --git a/test/box-luatest/gh_6794_recover_nonmatching_xlogs_test.lua b/test/box-luatest/gh_6794_recover_nonmatching_xlogs_test.lua
index 09b971693f07fd3a62ee60f3d71cc74ad7b09fc4..fdbb12b9a62caec453b99c0cb2eab9c5d68376b1 100644
--- a/test/box-luatest/gh_6794_recover_nonmatching_xlogs_test.lua
+++ b/test/box-luatest/gh_6794_recover_nonmatching_xlogs_test.lua
@@ -11,7 +11,7 @@ g.before_test('test_panic_without_force_recovery', function()
end)
g.after_test("test_panic_without_force_recovery", function()
- g.server:clean()
+ g.server:drop()
end)
g.before_test('test_ignore_with_force_recovery', function()
diff --git a/test/box-luatest/gh_7800_recover_snap_without_spaces_test.lua b/test/box-luatest/gh_7800_recover_snap_without_spaces_test.lua
index e4d0ee227e270d9128b764e7100953ea740d6e76..69ebb0718b8722029948f4c09c406ceba525f171 100644
--- a/test/box-luatest/gh_7800_recover_snap_without_spaces_test.lua
+++ b/test/box-luatest/gh_7800_recover_snap_without_spaces_test.lua
@@ -10,7 +10,7 @@ g.before_all(function()
end)
g.after_all(function()
- g.server:clean()
+ g.server:drop()
end)
g.test_recovery = function()
diff --git a/test/box-luatest/gh_7846_crash_on_replica_id_alter_test.lua b/test/box-luatest/gh_7846_crash_on_replica_id_alter_test.lua
index 83f6985fbdba1ffe54e650dc10f8ffedab19d022..1553952f6a535d12bc1aee517853b3ab1d9a3e8e 100644
--- a/test/box-luatest/gh_7846_crash_on_replica_id_alter_test.lua
+++ b/test/box-luatest/gh_7846_crash_on_replica_id_alter_test.lua
@@ -46,11 +46,6 @@ g.test_before_replace_alter_replica_id = function(cg)
end)
end
- if ret_nil == false then
- server2:drop()
- else
- -- Cannot drop server because it was not started.
- server2:clean()
- end
+ server2:drop()
server1:drop()
end
diff --git a/test/box-luatest/gh_7917_log_row_on_recovery_error_test.lua b/test/box-luatest/gh_7917_log_row_on_recovery_error_test.lua
index aaa3b78068a0176c78398290d7f0f17a01781243..23aba32466ed873e17f1a12a0dec995e453ba357 100644
--- a/test/box-luatest/gh_7917_log_row_on_recovery_error_test.lua
+++ b/test/box-luatest/gh_7917_log_row_on_recovery_error_test.lua
@@ -24,5 +24,5 @@ g.test_log_row_on_recovery_error = function(cg)
end
g.after_each(function(cg)
- cg.server:clean()
+ cg.server:drop()
end)
diff --git a/test/box-luatest/gh_7974_force_recovery_bugs_test.lua b/test/box-luatest/gh_7974_force_recovery_bugs_test.lua
index c8fc535ad159af7d3f39d19557d09aeca6930802..23a740d91fce4415d30367743ce6d2e70da63541 100644
--- a/test/box-luatest/gh_7974_force_recovery_bugs_test.lua
+++ b/test/box-luatest/gh_7974_force_recovery_bugs_test.lua
@@ -38,7 +38,7 @@ g.test_unknown_request_type_force_recovery = function()
"Unknown request type 777", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery works with snapshot containing no user
@@ -75,7 +75,7 @@ g.test_invalid_non_insert_request_force_recovery = function()
"Invalid MsgPack %- raft body", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery works with snapshot containing an invalid user
@@ -115,7 +115,7 @@ g.test_invalid_user_space_request_force_recovery = function()
"Space '777' does not exist", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery does not work with snapshot containing one
@@ -145,7 +145,7 @@ g.test_first_corrupted_request_force_recovery = function()
"can't parse row", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery works with snapshot containing one valid
@@ -185,7 +185,7 @@ g.test_second_corrupted_request_force_recovery = function()
"can't parse row", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery does not work with empty snapshot.
@@ -215,7 +215,7 @@ g.test_empty_snapshot_force_recovery = function()
"Snapshot has no system spaces", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
-- Checks that force recovery does not work with snapshot containing no system
@@ -245,5 +245,5 @@ g.test_only_user_space_request_force_recovery = function()
"Snapshot has no system spaces", nil,
{filename = log}), nil)
end)
- s:clean()
+ s:drop()
end
diff --git a/test/replication-luatest/bootstrap_strategy_test.lua b/test/replication-luatest/bootstrap_strategy_test.lua
index ca33c766c544e0360ad660c92c36381c439654a7..632798d983435d2199ae8fd812d2faff8c9c51c5 100644
--- a/test/replication-luatest/bootstrap_strategy_test.lua
+++ b/test/replication-luatest/bootstrap_strategy_test.lua
@@ -115,8 +115,7 @@ g_auto.test_join_checks_fullmesh = function(cg)
'Server3 detected a missing connection to ' .. uuid2)
end)
t.assert(not server_is_ready(cg.server3), 'Server3 is dead')
- -- Server is dead, stopping it will fail.
- cg.server3:clean()
+ cg.server3:drop()
end
g_auto.before_test('test_sync_waits_for_all_connected', function(cg)
@@ -185,7 +184,7 @@ end
local g_config = t.group('gh-7999-bootstrap-strategy-config')
g_config.after_each(function(cg)
- cg.replica_set:clean()
+ cg.replica_set:drop()
end)
g_config.before_test('test_no_replication', function(cg)
diff --git a/test/replication-luatest/gh_5295_split_brain_test.lua b/test/replication-luatest/gh_5295_split_brain_test.lua
index 5a19f4f1a222d328481c8215baa06354e612c25b..f0438c1121aa974f9eeaa28f18aa402357045f90 100644
--- a/test/replication-luatest/gh_5295_split_brain_test.lua
+++ b/test/replication-luatest/gh_5295_split_brain_test.lua
@@ -80,8 +80,7 @@ end)
-- Drop the partitioned server after each case of split-brain.
g.after_each(function(cg)
- cg.split_replica:stop()
- cg.split_replica:clean()
+ cg.split_replica:drop()
-- Drop the replica's cluster entry, so that next one receives same id.
cg.main:exec(function()
box.ctl.promote()
diff --git a/test/replication-luatest/gh_6036_qsync_order_test.lua b/test/replication-luatest/gh_6036_qsync_order_test.lua
index 1953a542b4080280a24c2dcce3a26ceed1b03d10..86f89d98759d5eb09175b439d0b2babd17c11bb6 100644
--- a/test/replication-luatest/gh_6036_qsync_order_test.lua
+++ b/test/replication-luatest/gh_6036_qsync_order_test.lua
@@ -163,8 +163,7 @@ g.after_test("test_qsync_order", function(cg)
cg.box_cfg.replication[3] = nil
cg.r1:exec(update_replication, cg.box_cfg.replication)
cg.r2:exec(update_replication, cg.box_cfg.replication)
- cg.r3:stop()
- cg.r3:clean()
+ cg.r3:drop()
cg.r3 = nil
end)
diff --git a/test/replication-luatest/gh_7253_election_long_wal_write_test.lua b/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
index 72e5440832165e69f0f27900147bc826c2d67ca6..a8d8b792c262d36b00a3798f9f81829601f9ae78 100644
--- a/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
+++ b/test/replication-luatest/gh_7253_election_long_wal_write_test.lua
@@ -501,8 +501,7 @@ g.test_old_leader_txn_during_promote_write_complex = function(g)
local server4_id = g.server4:get_instance_id()
local server5_id = g.server5:get_instance_id()
for _, s in pairs({g.server4, g.server5}) do
- s:stop()
- s:clean()
+ s:drop()
g.cluster:delete_server(s.alias)
g[s.alias] = nil
end