Skip to content
Snippets Groups Projects
Commit e67a9034 authored by Sulverus's avatar Sulverus
Browse files

snapshot_stress.test fix with workdir

finalizers.test marked as long run in suite
parent 43f09865
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
core = tarantool
description = long running tests
script = box.lua
long_run = memtx_delete_replace_update.test.lua sophia_delete_replace_update.test.lua memtx_delete_insert.test.lua sophia_delete_insert.test.lua
long_run = memtx_delete_replace_update.test.lua sophia_delete_replace_update.test.lua memtx_delete_insert.test.lua sophia_delete_insert.test.lua finalizers.test.py
valgrind_disabled =
release_disabled =
lua_libs = suite.lua
......
......@@ -39,29 +39,6 @@ tarantool_bin_path = arg[-1]
work_dir = fio.cwd()
---
...
snap_dir_as_expected = false
---
...
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == nil
---
...
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == ''
---
...
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == '.'
---
...
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == work_dir
---
...
snap_dir_as_expected
---
- true
...
box.cfg.snap_dir
---
- .
...
script_path = fio.pathjoin(work_dir, 'snap_script.lua')
---
...
......@@ -291,7 +268,7 @@ s2:drop();
---
...
script_code = [[
box.cfg{ slab_alloc_arena = 0.5, snap_dir = ".", wal_mode = "none" }
box.cfg{ slab_alloc_arena = 0.5, snap_dir = "]] .. box.cfg.snap_dir .. [[", wal_mode = "none" }
s1 = box.space.accounts
s2 = box.space.operations
......
......@@ -21,13 +21,6 @@ fio = require('fio')
tarantool_bin_path = arg[-1]
work_dir = fio.cwd()
snap_dir_as_expected = false
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == nil
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == ''
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == '.'
snap_dir_as_expected = snap_dir_as_expected or box.cfg.snap_dir == work_dir
snap_dir_as_expected
box.cfg.snap_dir
script_path = fio.pathjoin(work_dir, 'snap_script.lua')
cmd_template = [[/bin/sh -c 'cd "%s" && "%s" ./snap_script.lua 2> /dev/null']]
cmd = string.format(cmd_template, work_dir, tarantool_bin_path)
......@@ -167,7 +160,7 @@ s1:drop();
s2:drop();
script_code = [[
box.cfg{ slab_alloc_arena = 0.5, snap_dir = ".", wal_mode = "none" }
box.cfg{ slab_alloc_arena = 0.5, snap_dir = "]] .. box.cfg.snap_dir .. [[", wal_mode = "none" }
s1 = box.space.accounts
s2 = box.space.operations
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment