Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
d32870ff
Unverified
Commit
d32870ff
authored
4 years ago
by
Richard van der Hoff
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix validate_config on nested objects (#9054)
parent
fa5f5cbc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/9054.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/9054.bugfix
synapse/config/_util.py
+1
-1
1 addition, 1 deletion
synapse/config/_util.py
tests/config/test_util.py
+53
-0
53 additions, 0 deletions
tests/config/test_util.py
with
55 additions
and
1 deletion
changelog.d/9054.bugfix
0 → 100644
+
1
−
0
View file @
d32870ff
Fix a minor bug which could cause confusing error messages from invalid configurations.
This diff is collapsed.
Click to expand it.
synapse/config/_util.py
+
1
−
1
View file @
d32870ff
...
...
@@ -56,7 +56,7 @@ def json_error_to_config_error(
"""
# copy `config_path` before modifying it.
path
=
list
(
config_path
)
for
p
in
list
(
e
.
path
):
for
p
in
list
(
e
.
absolute_
path
):
if
isinstance
(
p
,
int
):
path
.
append
(
"
<item %i>
"
%
p
)
else
:
...
...
This diff is collapsed.
Click to expand it.
tests/config/test_util.py
0 → 100644
+
53
−
0
View file @
d32870ff
# -*- coding: utf-8 -*-
# Copyright 2021 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
synapse.config
import
ConfigError
from
synapse.config._util
import
validate_config
from
tests.unittest
import
TestCase
class
ValidateConfigTestCase
(
TestCase
):
"""
Test cases for synapse.config._util.validate_config
"""
def
test_bad_object_in_array
(
self
):
"""
malformed objects within an array should be validated correctly
"""
# consider a structure:
#
# array_of_objs:
# - r: 1
# foo: 2
#
# - r: 2
# bar: 3
#
# ... where each entry must contain an "r": check that the path
# to the required item is correclty reported.
schema
=
{
"
type
"
:
"
object
"
,
"
properties
"
:
{
"
array_of_objs
"
:
{
"
type
"
:
"
array
"
,
"
items
"
:
{
"
type
"
:
"
object
"
,
"
required
"
:
[
"
r
"
]},
},
},
}
with
self
.
assertRaises
(
ConfigError
)
as
c
:
validate_config
(
schema
,
{
"
array_of_objs
"
:
[{}]},
(
"
base
"
,))
self
.
assertEqual
(
c
.
exception
.
path
,
[
"
base
"
,
"
array_of_objs
"
,
"
<item 0>
"
])
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