Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
b5298eec
Commit
b5298eec
authored
10 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Patches
Plain Diff
Update tests after sophia push.
parent
1a7d27db
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/box/admin.result
+2
-4
2 additions, 4 deletions
test/box/admin.result
test/box/cfg.result
+5
-5
5 additions, 5 deletions
test/box/cfg.result
with
7 additions
and
9 deletions
test/box/admin.result
+
2
−
4
View file @
b5298eec
...
@@ -25,12 +25,10 @@ box.cfg
...
@@ -25,12 +25,10 @@ box.cfg
background: false
background: false
readahead: 16320
readahead: 16320
sophia:
sophia:
node_page_size: 131072
page_size: 131072
memory_limit: 0
node_compact_wm: 1
threads: 5
threads: 5
node_size: 134217728
node_size: 134217728
node_branch_wm: 1048576
0
memory_limit:
0
listen: <uri>
listen: <uri>
logger_nonblock: true
logger_nonblock: true
snap_dir: .
snap_dir: .
...
...
This diff is collapsed.
Click to expand it.
test/box/cfg.result
+
5
−
5
View file @
b5298eec
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
--# push filter 'admin: .*' to 'admin: <uri>'
--# push filter 'admin: .*' to 'admin: <uri>'
box.cfg.nosuchoption = 1
box.cfg.nosuchoption = 1
---
---
- error: '[string "-- load_cfg.lua - internal file..."]:21
3
: Attempt to modify a read-only
- error: '[string "-- load_cfg.lua - internal file..."]:21
1
: Attempt to modify a read-only
table'
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
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
...
@@ -66,23 +66,23 @@ t
-- check that cfg with unexpected parameter fails.
-- check that cfg with unexpected parameter fails.
box.cfg{sherlock = 'holmes'}
box.cfg{sherlock = 'holmes'}
---
---
- error: '[string "-- load_cfg.lua - internal file..."]:13
3
: Error: cfg parameter
- error: '[string "-- load_cfg.lua - internal file..."]:13
1
: Error: cfg parameter
''sherlock'' is unexpected'
''sherlock'' is unexpected'
...
...
-- check that cfg with unexpected type of parameter failes
-- check that cfg with unexpected type of parameter failes
box.cfg{listen = {}}
box.cfg{listen = {}}
---
---
- error: '[string "-- load_cfg.lua - internal file..."]:14
8
: Error: cfg parameter
- error: '[string "-- load_cfg.lua - internal file..."]:14
6
: Error: cfg parameter
''listen'' should be one of types: string, number'
''listen'' should be one of types: string, number'
...
...
box.cfg{wal_dir = 0}
box.cfg{wal_dir = 0}
---
---
- error: '[string "-- load_cfg.lua - internal file..."]:14
2
: Error: cfg parameter
- error: '[string "-- load_cfg.lua - internal file..."]:14
0
: Error: cfg parameter
''wal_dir'' should be of type string'
''wal_dir'' should be of type string'
...
...
box.cfg{coredump = 'true'}
box.cfg{coredump = 'true'}
---
---
- error: '[string "-- load_cfg.lua - internal file..."]:14
2
: Error: cfg parameter
- error: '[string "-- load_cfg.lua - internal file..."]:14
0
: Error: cfg parameter
''coredump'' should be of type boolean'
''coredump'' should be of type boolean'
...
...
--# clear filter
--# clear filter
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment