From b89c7cae5f916993f12ed9785ca4b1c7291f87f7 Mon Sep 17 00:00:00 2001
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date: Thu, 10 Jun 2021 00:43:35 +0200
Subject: [PATCH] test: remove replica-applier-rollback.lua
The script name was too long. It was also used as a name for the
unix socket file on which the replica listens. As a result, the
test couldn't start, at least on my machine.
Besides, the script was not any different from the existing
replica.lua, except a couple of not important settings.
The patch drops it and makes gh-4730-applier-rollback.test.lua use
replica.lua. Now it can run on my machine.
Done as a preparation for #6027, which is slightly related to the
test - it is also about errors in applier and their display.
---
test/replication/gh-4730-applier-rollback.result | 2 +-
.../gh-4730-applier-rollback.test.lua | 2 +-
test/replication/replica-applier-rollback.lua | 16 ----------------
3 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 test/replication/replica-applier-rollback.lua
diff --git a/test/replication/gh-4730-applier-rollback.result b/test/replication/gh-4730-applier-rollback.result
index 26a0eb6fa5..bd9530074b 100644
--- a/test/replication/gh-4730-applier-rollback.result
+++ b/test/replication/gh-4730-applier-rollback.result
@@ -19,7 +19,7 @@ box.schema.user.grant('guest', 'replication')
--
-- Create replica instance, we're the master and
-- start it, no data to sync yet though
-test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'")
+test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica.lua'")
| ---
| - true
| ...
diff --git a/test/replication/gh-4730-applier-rollback.test.lua b/test/replication/gh-4730-applier-rollback.test.lua
index de7a740dec..a010debb4f 100644
--- a/test/replication/gh-4730-applier-rollback.test.lua
+++ b/test/replication/gh-4730-applier-rollback.test.lua
@@ -12,7 +12,7 @@ box.schema.user.grant('guest', 'replication')
--
-- Create replica instance, we're the master and
-- start it, no data to sync yet though
-test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'")
+test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica.lua'")
test_run:cmd("start server replica_slave")
--
diff --git a/test/replication/replica-applier-rollback.lua b/test/replication/replica-applier-rollback.lua
deleted file mode 100644
index 26fb100554..0000000000
--- a/test/replication/replica-applier-rollback.lua
+++ /dev/null
@@ -1,16 +0,0 @@
---
--- vim: ts=4 sw=4 et
---
-
-print('arg', arg)
-
-box.cfg({
- replication = os.getenv("MASTER"),
- listen = os.getenv("LISTEN"),
- memtx_memory = 107374182,
- replication_timeout = 0.1,
- replication_connect_timeout = 0.5,
- read_only = true,
-})
-
-require('console').listen(os.getenv('ADMIN'))
--
GitLab