From e0933bed1126f9fbff7524a79da02a7ee17ba614 Mon Sep 17 00:00:00 2001
From: Nick Zavaritsky <mejedi@gmail.com>
Date: Mon, 11 Jan 2016 20:24:01 +0300
Subject: [PATCH] put lua scripts used by replication-py into the same dir

---
 test/replication-py/cluster.test.py            | 6 +++---
 test/replication-py/conflict.test.py           | 2 +-
 test/replication-py/init_storage.test.py       | 4 ++--
 test/replication-py/multi.test.py              | 2 +-
 test/{replication => replication-py}/panic.lua | 0
 test/replication-py/readonly.test.py           | 2 +-
 test/replication-py/swap.test.py               | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename test/{replication => replication-py}/panic.lua (100%)

diff --git a/test/replication-py/cluster.test.py b/test/replication-py/cluster.test.py
index 7d5e713092..644495899b 100644
--- a/test/replication-py/cluster.test.py
+++ b/test/replication-py/cluster.test.py
@@ -97,7 +97,7 @@ print 'gh-434: Assertion if replace _cluster tuple for local server'
 print '-------------------------------------------------------------'
 server.stop()
 script = server.script
-server.script = "replication/panic.lua"
+server.script = "replication-py/panic.lua"
 server.deploy()
 
 new_uuid = '8c7ff474-65f9-4abe-81a4-a3e1019bb1ae'
@@ -158,7 +158,7 @@ master_id = master.get_param('server')['id']
 master.admin("box.schema.user.grant('guest', 'replication')")
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir
 replica.rpl_master = master
 replica.deploy()
@@ -294,7 +294,7 @@ master.admin("box.snapshot()")
 master.admin('box.info.vclock[%d] == 1' % replica_id)
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir
 replica.rpl_master = master
 replica.deploy()
diff --git a/test/replication-py/conflict.test.py b/test/replication-py/conflict.test.py
index 8d6e9347f1..fd6248124e 100644
--- a/test/replication-py/conflict.test.py
+++ b/test/replication-py/conflict.test.py
@@ -10,7 +10,7 @@ master = server
 master.admin("box.schema.user.grant('guest', 'replication')")
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir
 replica.rpl_master = master
 replica.deploy()
diff --git a/test/replication-py/init_storage.test.py b/test/replication-py/init_storage.test.py
index e59ff14c9c..d94d4414f7 100644
--- a/test/replication-py/init_storage.test.py
+++ b/test/replication-py/init_storage.test.py
@@ -20,7 +20,7 @@ print 'replica test 1 (no such space)'
 print '-------------------------------------------------------------'
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir #os.path.join(server.vardir, 'replica')
 replica.rpl_master = master
 replica.deploy()
@@ -61,7 +61,7 @@ master.admin("for k = 20, 29 do box.space[42]:upsert({k}, {}) end")
 lsn = master.get_lsn(master_id)
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir #os.path.join(server.vardir, 'replica')
 replica.rpl_master = master
 replica.deploy()
diff --git a/test/replication-py/multi.test.py b/test/replication-py/multi.test.py
index 6a564d9967..c6d4a03e86 100644
--- a/test/replication-py/multi.test.py
+++ b/test/replication-py/multi.test.py
@@ -24,7 +24,7 @@ master_lsn = master.get_lsn(master.id)
 cluster = [ master ]
 for i in range(REPLICA_N - 1):
     server = TarantoolServer(server.ini)
-    server.script = 'replication/replica.lua'
+    server.script = 'replication-py/replica.lua'
     server.vardir = os.path.join(server.vardir, 'replica', str(master.id + i))
     server.rpl_master = master
     server.deploy()
diff --git a/test/replication/panic.lua b/test/replication-py/panic.lua
similarity index 100%
rename from test/replication/panic.lua
rename to test/replication-py/panic.lua
diff --git a/test/replication-py/readonly.test.py b/test/replication-py/readonly.test.py
index 438a818626..0ecf684dd3 100644
--- a/test/replication-py/readonly.test.py
+++ b/test/replication-py/readonly.test.py
@@ -9,7 +9,7 @@ master_id = master.get_param('server')['id']
 master.admin("box.schema.user.grant('guest', 'replication')")
 
 replica = TarantoolServer(server.ini)
-replica.script = 'replication/replica.lua'
+replica.script = 'replication-py/replica.lua'
 replica.vardir = server.vardir #os.path.join(server.vardir, 'replica')
 replica.rpl_master = master
 replica.deploy()
diff --git a/test/replication-py/swap.test.py b/test/replication-py/swap.test.py
index 3153e36ee1..cac15e7474 100644
--- a/test/replication-py/swap.test.py
+++ b/test/replication-py/swap.test.py
@@ -42,7 +42,7 @@ os.putenv('MASTER', master.uri)
 
 # replica server
 replica = TarantoolServer()
-replica.script = "replication/replica.lua"
+replica.script = "replication-py/replica.lua"
 replica.vardir = server.vardir #os.path.join(server.vardir, 'replica')
 replica.deploy()
 replica.admin("while box.info.server.id == 0 do require('fiber').sleep(0.01) end")
-- 
GitLab