diff --git a/test/box/admin.result b/test/box/admin.result index 4391b1d27f4c9c9ce6ceb97349344593761b9f07..6fd746c7fb8d73eebc5f39b3422da5fcd4667466 100644 --- a/test/box/admin.result +++ b/test/box/admin.result @@ -25,12 +25,10 @@ box.cfg background: false readahead: 16320 sophia: - node_page_size: 131072 - memory_limit: 0 - node_compact_wm: 1 + page_size: 131072 threads: 5 node_size: 134217728 - node_branch_wm: 10485760 + memory_limit: 0 listen: <uri> logger_nonblock: true snap_dir: . diff --git a/test/box/cfg.result b/test/box/cfg.result index ed75b2fb4395062ce21fd58f7701974a6c965afe..1aa9496bde8419dcd8782a0708c1aef4237f0674 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..."]:213: Attempt to modify a read-only +- error: '[string "-- load_cfg.lua - internal file..."]:211: 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 @@ -66,23 +66,23 @@ t -- check that cfg with unexpected parameter fails. box.cfg{sherlock = 'holmes'} --- -- error: '[string "-- load_cfg.lua - internal file..."]:133: Error: cfg parameter +- error: '[string "-- load_cfg.lua - internal file..."]:131: Error: cfg parameter ''sherlock'' is unexpected' ... -- check that cfg with unexpected type of parameter failes box.cfg{listen = {}} --- -- error: '[string "-- load_cfg.lua - internal file..."]:148: Error: cfg parameter +- error: '[string "-- load_cfg.lua - internal file..."]:146: Error: cfg parameter ''listen'' should be one of types: string, number' ... box.cfg{wal_dir = 0} --- -- error: '[string "-- load_cfg.lua - internal file..."]:142: Error: cfg parameter +- error: '[string "-- load_cfg.lua - internal file..."]:140: Error: cfg parameter ''wal_dir'' should be of type string' ... box.cfg{coredump = 'true'} --- -- error: '[string "-- load_cfg.lua - internal file..."]:142: Error: cfg parameter +- error: '[string "-- load_cfg.lua - internal file..."]:140: Error: cfg parameter ''coredump'' should be of type boolean' ... --# clear filter