diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py index 2a5dba6446e20ebe9984d65aaccda8f6af8ba04e..69155ea3f892cd12d673125a640e0cd4256988dd 100644 --- a/test/lib/tarantool_server.py +++ b/test/lib/tarantool_server.py @@ -295,16 +295,6 @@ class TarantoolServer(Server): return self._cfgfile_source = os.path.abspath(path) - @property - def init_lua_source(self): - if not hasattr(self, '_init_lua_source'): self._init_lua_source = None - return self._init_lua_source - @init_lua_source.setter - def init_lua_source(self, val): - if val is None: - return - self._init_lua_source = os.path.abspath(val) - @property def builddir(self): if not hasattr(self, '_builddir'): @@ -429,7 +419,7 @@ class TarantoolServer(Server): 'config': None, 'core': 'tarantool', 'gdb': False, - 'init_lua': None, + 'shebang': None, 'lua_libs': [], 'random_ports': True, 'valgrind': False, @@ -449,7 +439,7 @@ class TarantoolServer(Server): self.cfgfile_source = ini['config'] self.core = ini['core'] self.gdb = ini['gdb'] - self.init_lua_source = ini['init_lua'] + self.shebang = ini['shebang'] self.lua_libs = ini['lua_libs'] self.random_ports = ini['random_ports'] self.valgrind = ini['valgrind'] @@ -540,8 +530,6 @@ class TarantoolServer(Server): if self.shebang: shutil.copy(self.shebang, self.init_lua) os.chmod(self.init_lua, 0777) - elif self.init_lua_source: - shutil.copy(self.init_lua_source, self.init_lua) if self.lua_libs: for i in self.lua_libs: source = os.path.join(self.testdir, i) diff --git a/test/lib/test_suite.py b/test/lib/test_suite.py index 96d330f74f79103381dd6462ced64c57e31ac928..5fddeedc4a554f6ecb8f51903b43ea32792c8363 100644 --- a/test/lib/test_suite.py +++ b/test/lib/test_suite.py @@ -53,7 +53,7 @@ class TestSuite: self.ini.update(dict(config.items("default"))) self.ini.update(self.args.__dict__) - for i in ["config", "init_lua"]: + for i in ["config", "shebang"]: self.ini[i] = os.path.join(suite_path, self.ini[i]) if i in self.ini else None for i in ["disabled", "valgrind_disabled", "release_disabled"]: self.ini[i] = dict.fromkeys(self.ini[i].split()) if i in self.ini else dict()