From e2b3d20261ba5a066bef72c7189fd18079168ce0 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Thu, 25 Sep 2014 18:09:28 +0400
Subject: [PATCH] Fix #490: update tests
---
test/app/cfg.result | 2 +-
test/app/float_value.result | 19 ++++++++++---------
test/app/init_script.result | 19 ++++++++++---------
test/box/admin.result | 7 ++++---
test/box/cfg.result | 16 +++++++++-------
5 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/test/app/cfg.result b/test/app/cfg.result
index 5ded3d0573..60f07692ad 100644
--- a/test/app/cfg.result
+++ b/test/app/cfg.result
@@ -1,2 +1,2 @@
-false [string "-- load_cfg.lua - internal file..."]:137: Please call box.cfg{} first
+false [string "-- load_cfg.lua - internal file..."]:139: Please call box.cfg{} first
true table
diff --git a/test/app/float_value.result b/test/app/float_value.result
index b7300c58a9..c3cfdb6c80 100644
--- a/test/app/float_value.result
+++ b/test/app/float_value.result
@@ -11,15 +11,16 @@ box.cfg
10 logger_nonblock:true
11 snap_dir:.
12 coredump:false
-13 wal_mode:write
-14 panic_on_snap_error:true
-15 panic_on_wal_error:false
-16 too_long_threshold:0.01
-17 readahead:16320
-18 wal_dir:.
-19 snapshot_period:0
-20 slab_alloc_minimal:64
-21 wal_dir_rescan_delay:0.1
+13 sophia_dir:./sophia
+14 wal_mode:write
+15 panic_on_snap_error:true
+16 panic_on_wal_error:false
+17 too_long_threshold:0.01
+18 slab_alloc_minimal:64
+19 wal_dir:.
+20 readahead:16320
+21 snapshot_period:0
+22 wal_dir_rescan_delay:0.1
------------------------------------------------------
Check that too_long_threshold = 0.01
0.01
diff --git a/test/app/init_script.result b/test/app/init_script.result
index 428c555e57..321c3db21f 100644
--- a/test/app/init_script.result
+++ b/test/app/init_script.result
@@ -6,7 +6,7 @@ box.cfg
1 snapshot_count:6
2 pid_file:box.pid
3 slab_alloc_factor:2
-4 slab_alloc_minimal:64
+4 rows_per_wal:500000
5 background:false
6 logger:tarantool.log
7 slab_alloc_arena:0.1
@@ -15,15 +15,16 @@ box.cfg
10 logger_nonblock:true
11 snap_dir:.
12 coredump:false
-13 wal_mode:write
-14 panic_on_snap_error:true
-15 panic_on_wal_error:false
-16 too_long_threshold:0.5
-17 readahead:16320
-18 rows_per_wal:500000
+13 sophia_dir:./sophia
+14 wal_mode:write
+15 panic_on_snap_error:true
+16 panic_on_wal_error:false
+17 too_long_threshold:0.5
+18 slab_alloc_minimal:64
19 wal_dir:.
-20 snapshot_period:0
-21 wal_dir_rescan_delay:0.1
+20 readahead:16320
+21 snapshot_period:0
+22 wal_dir_rescan_delay:0.1
--
-- Test insert from detached fiber
--
diff --git a/test/box/admin.result b/test/box/admin.result
index bdd175de0c..82da4e86bf 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -21,7 +21,7 @@ box.cfg
- snapshot_count: 6
too_long_threshold: 0.5
slab_alloc_factor: 2
- slab_alloc_minimal: 64
+ rows_per_wal: 50
background: false
slab_alloc_arena: 0.1
log_level: 5
@@ -29,14 +29,15 @@ box.cfg
logger_nonblock: true
snap_dir: .
coredump: false
+ sophia_dir: ./sophia
wal_mode: write
panic_on_snap_error: true
panic_on_wal_error: false
pid_file: tarantool.pid
- readahead: 16320
+ slab_alloc_minimal: 64
wal_dir: .
+ readahead: 16320
snapshot_period: 0
- rows_per_wal: 50
wal_dir_rescan_delay: 0.1
...
space:insert{1, 'tuple'}
diff --git a/test/box/cfg.result b/test/box/cfg.result
index f08d7e79ef..86c19dbde9 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -2,7 +2,7 @@
--# push filter 'admin: .*' to 'admin: <uri>'
box.cfg.nosuchoption = 1
---
-- error: '[string "-- load_cfg.lua - internal file..."]:202: Attempt to modify a read-only
+- error: '[string "-- load_cfg.lua - internal file..."]:204: Attempt to modify a read-only
table'
...
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
@@ -13,7 +13,7 @@ t
- - 'snapshot_count: 6'
- 'too_long_threshold: 0.5'
- 'slab_alloc_factor: 2'
- - 'slab_alloc_minimal: 64'
+ - 'rows_per_wal: 50'
- 'background: false'
- 'slab_alloc_arena: 0.1'
- 'log_level: 5'
@@ -21,14 +21,15 @@ t
- 'logger_nonblock: true'
- 'snap_dir: .'
- 'coredump: false'
+ - 'sophia_dir: ./sophia'
- 'wal_mode: write'
- 'panic_on_snap_error: true'
- 'panic_on_wal_error: false'
- 'pid_file: tarantool.pid'
- - 'readahead: 16320'
+ - 'slab_alloc_minimal: 64'
- 'wal_dir: .'
+ - 'readahead: 16320'
- 'snapshot_period: 0'
- - 'rows_per_wal: 50'
- 'wal_dir_rescan_delay: 0.1'
...
-- must be read-only
@@ -43,7 +44,7 @@ t
- - 'snapshot_count: 6'
- 'too_long_threshold: 0.5'
- 'slab_alloc_factor: 2'
- - 'slab_alloc_minimal: 64'
+ - 'rows_per_wal: 50'
- 'background: false'
- 'slab_alloc_arena: 0.1'
- 'log_level: 5'
@@ -51,14 +52,15 @@ t
- 'logger_nonblock: true'
- 'snap_dir: .'
- 'coredump: false'
+ - 'sophia_dir: ./sophia'
- 'wal_mode: write'
- 'panic_on_snap_error: true'
- 'panic_on_wal_error: false'
- 'pid_file: tarantool.pid'
- - 'readahead: 16320'
+ - 'slab_alloc_minimal: 64'
- 'wal_dir: .'
+ - 'readahead: 16320'
- 'snapshot_period: 0'
- - 'rows_per_wal: 50'
- 'wal_dir_rescan_delay: 0.1'
...
--# clear filter
--
GitLab