init-tests: review fixes

Make the new tests more stable.
Add a logger output, so that log is output to a file rather than terminal.
Make require_mod module test more robust.

test/app/float_value.result

@@ -3,20 +3,20 @@ box.cfg
 2	slab_alloc_factor:2
 3	rows_per_wal:50
 4	admin_port:3313
-5	primary_port:3314
-6	wal_dir:.
-7	logger_nonblock:true
-8	snap_dir:.
-9	coredump:false
-10	wal_mode:write
-11	background:false
+5	logger:tarantool.log
+6	slab_alloc_arena:0.1
+7	wal_dir:.
+8	logger_nonblock:true
+9	snap_dir:.
+10	coredump:false
+11	wal_mode:write
 12	panic_on_snap_error:true
 13	panic_on_wal_error:false
-14	readahead:16320
-15	too_long_threshold:0.01
-16	slab_alloc_arena:0.1
+14	log_level:5
+15	readahead:16320
+16	too_long_threshold:0.01
 17	slab_alloc_minimal:64
-18	log_level:5
+18	background:false
 19	wal_dir_rescan_delay:0.1
 ------------------------------------------------------
 Check that too_long_threshold = 0.01

test/app/float_value.test.lua

@@ -4,15 +4,18 @@
 --
 box.cfg{
     admin_port = 3313,
-    primary_port = 3314,
     slab_alloc_arena = 0.1,
     pid_file = "box.pid",
     rows_per_wal = 50,
-    too_long_threshold = 0.01
+    too_long_threshold = 0.01,
+    logger="tarantool.log"
 }
 
+if box.space.space1 ~= nil then
+    box.space.space1:drop()
+end
 s = box.schema.create_space('space1')
-s:create_index('primary', {type = 'hash', parts = {0, 'NUM'}}) 
+s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
 
 t = {}
 for k,v in pairs(box.cfg) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t,k..':'..tostring(v)) end end

test/app/init_script.result

@@ -7,21 +7,22 @@ box.cfg
 2	slab_alloc_factor:2
 3	slab_alloc_minimal:64
 4	admin_port:3313
-5	readahead:16320
-6	log_level:5
-7	logger_nonblock:true
-8	snap_dir:.
-9	coredump:false
-10	wal_mode:write
-11	primary_port:3314
-12	panic_on_snap_error:true
-13	panic_on_wal_error:false
-14	rows_per_wal:500000
-15	pid_file:box.pid
-16	background:false
-17	slab_alloc_arena:1
-18	wal_dir:.
-19	wal_dir_rescan_delay:0.1
+5	logger:tarantool.log
+6	primary_port:3314
+7	wal_dir:.
+8	logger_nonblock:true
+9	snap_dir:.
+10	coredump:false
+11	wal_mode:write
+12	log_level:5
+13	panic_on_snap_error:true
+14	panic_on_wal_error:false
+15	rows_per_wal:500000
+16	readahead:16320
+17	pid_file:box.pid
+18	background:false
+19	slab_alloc_arena:1
+20	wal_dir_rescan_delay:0.1
 --
 -- Test insert from detached fiber
 --

test/app/init_script.test.lua

@@ -6,12 +6,17 @@ box.cfg{
     admin_port = 3313,
     primary_port = 3314,
     pid_file = "box.pid",
+    logger="tarantool.log"
 }
 
 yaml = require('yaml')
 fiber = require('fiber')
 
-space = box.schema.create_space('tweedledum', { id = 0 })
+if box.space.tweedledum ~= nil then
+    box.space.space1:drop()
+end
+
+space = box.schema.create_space('tweedledum')
 space:create_index('primary', { type = 'hash' })
 
 print[[
@@ -66,7 +71,7 @@ print(floor(0.5))
 print(floor(0.9))
 print(floor(1.1))
 
-mod = dofile('../app/require_mod.lua')
+mod = require('require_mod')
 print(mod.test(10, 15))
 --
 -- A test case for https://github.com/tarantool/tarantool/issues/53

test/app/suite.ini

 [default]
 core = app 
 description = application server tests
+lua_libs = lua/require_mod.lua

test/lib/app_server.py

@@ -3,7 +3,7 @@ import re
 import sys
 import glob
 import traceback
-import subprocess
+import shutil
 from subprocess import Popen, PIPE
 
 from lib.server import Server
@@ -27,9 +27,11 @@ class AppServer(Server):
             'vardir': None
         }; ini.update(_ini)
         Server.__init__(self, ini)
+        self.testdir = os.path.abspath(os.curdir)
         self.vardir = ini['vardir']
         self.builddir = ini['builddir']
         self.debug = False
+        self.lua_libs = ini['lua_libs']
 
     def deploy(self, config=None, binary=None, vardir=None,
                mem=None, start_and_exit=None, gdb=None, valgrind=None,
@@ -37,6 +39,10 @@ class AppServer(Server):
         self.vardir = vardir
         if not os.access(self.vardir, os.F_OK):
             os.makedirs(self.vardir)
+        if self.lua_libs:
+            for i in self.lua_libs:
+                source = os.path.join(self.testdir, i)
+                shutil.copy(source, self.vardir)
 
     @classmethod
     def find_exe(cls, builddir):