Skip to content

Commit

Permalink
Move tarantoolctl to test-run tool submodule
Browse files Browse the repository at this point in the history
Moved tarantoolctl to test-run tool submodule repository as:

  <tarantool repository>/test-run/.tarantoolctl

Also set backward compability to use old path location:

  <tarantool repository>/test/.tarantoolctl

as its primary place.
  • Loading branch information
avtikhon committed Nov 25, 2020
1 parent a68d01d commit 76477e8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .tarantoolctl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- Options for test-run tarantoolctl

local workdir = os.getenv('TEST_WORKDIR')
default_cfg = {
pid_file = workdir,
wal_dir = workdir,
memtx_dir = workdir,
vinyl_dir = workdir,
log = workdir,
background = false,
}

instance_dir = workdir

-- vim: set ft=lua :
5 changes: 4 additions & 1 deletion lib/tarantool_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,10 @@ def copy_files(self):
if (e.errno == errno.ENOENT):
continue
raise
shutil.copy('.tarantoolctl', self.vardir)
tntctl_file = '.tarantoolctl'
if not os.path.exists(tntctl_file):
tntctl_file = os.path.join(self.TEST_RUN_DIR, '.tarantoolctl')
shutil.copy(tntctl_file, self.vardir)
shutil.copy(os.path.join(self.TEST_RUN_DIR, 'test_run.lua'),
self.vardir)
# Need to use get here because of nondefault servers doesn't have ini.
Expand Down

0 comments on commit 76477e8

Please sign in to comment.