Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
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
Maunium
synapse
Commits
071f8b0f
Unverified
Commit
071f8b0f
authored
2 years ago
by
Patrick Cloke
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Factor out common code in tests and fix comments. (#14819)
parent
f4d2a734
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/14819.misc
+1
-0
1 addition, 0 deletions
changelog.d/14819.misc
stubs/synapse/synapse_rust/push.pyi
+14
-0
14 additions, 0 deletions
stubs/synapse/synapse_rust/push.pyi
tests/push/test_bulk_push_rule_evaluator.py
+49
-36
49 additions, 36 deletions
tests/push/test_bulk_push_rule_evaluator.py
with
64 additions
and
36 deletions
changelog.d/14819.misc
0 → 100644
+
1
−
0
View file @
071f8b0f
Refactor push tests.
This diff is collapsed.
Click to expand it.
stubs/synapse/synapse_rust/push.pyi
+
14
−
0
View file @
071f8b0f
# Copyright 2022 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
typing
import
Any
,
Collection
,
Dict
,
Mapping
,
Optional
,
Sequence
,
Set
,
Tuple
,
Union
from
synapse.types
import
JsonDict
...
...
This diff is collapsed.
Click to expand it.
tests/push/test_bulk_push_rule_evaluator.py
+
49
−
36
View file @
071f8b0f
# Copyright 2022 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
unittest.mock
import
patch
from
twisted.test.proto_helpers
import
MemoryReactor
from
synapse.api.room_versions
import
RoomVersions
from
synapse.push.bulk_push_rule_evaluator
import
BulkPushRuleEvaluator
from
synapse.rest
import
admin
from
synapse.rest.client
import
login
,
register
,
room
from
synapse.server
import
HomeServer
from
synapse.types
import
create_requester
from
synapse.util
import
Clock
from
tests.test_utils
import
simple_async_mock
from
tests.unittest
import
HomeserverTestCase
,
override_config
...
...
@@ -19,6 +37,20 @@ class TestBulkPushRuleEvaluator(HomeserverTestCase):
register
.
register_servlets
,
]
def
prepare
(
self
,
reactor
:
MemoryReactor
,
clock
:
Clock
,
homeserver
:
HomeServer
)
->
None
:
# Create a new user and room.
self
.
alice
=
self
.
register_user
(
"
alice
"
,
"
pass
"
)
self
.
token
=
self
.
login
(
self
.
alice
,
"
pass
"
)
self
.
requester
=
create_requester
(
self
.
alice
)
self
.
room_id
=
self
.
helper
.
create_room_as
(
self
.
alice
,
room_version
=
RoomVersions
.
V9
.
identifier
,
tok
=
self
.
token
)
self
.
event_creation_handler
=
self
.
hs
.
get_event_creation_handler
()
def
test_action_for_event_by_user_handles_noninteger_power_levels
(
self
)
->
None
:
"""
We should convert floats and strings to integers before passing to Rust.
...
...
@@ -26,46 +58,37 @@ class TestBulkPushRuleEvaluator(HomeserverTestCase):
A lack of validation: the gift that keeps on giving.
"""
# Create a new user and room.
alice
=
self
.
register_user
(
"
alice
"
,
"
pass
"
)
token
=
self
.
login
(
alice
,
"
pass
"
)
room_id
=
self
.
helper
.
create_room_as
(
alice
,
room_version
=
RoomVersions
.
V9
.
identifier
,
tok
=
token
)
# Alter the power levels in that room to include stringy and floaty levels.
# We need to suppress the validation logic or else it will reject these dodgy
# values. (Presumably this validation was not always present.)
event_creation_handler
=
self
.
hs
.
get_event_creation_handler
()
requester
=
create_requester
(
alice
)
with
patch
(
"
synapse.events.validator.validate_canonicaljson
"
),
patch
(
"
synapse.events.validator.jsonschema.validate
"
):
self
.
helper
.
send_state
(
room_id
,
self
.
room_id
,
"
m.room.power_levels
"
,
{
"
users
"
:
{
alice
:
"
100
"
},
# stringy
"
users
"
:
{
self
.
alice
:
"
100
"
},
# stringy
"
notifications
"
:
{
"
room
"
:
100.0
},
# float
},
token
,
self
.
token
,
state_key
=
""
,
)
# Create a new message event, and try to evaluate it under the dodgy
# power level event.
event
,
context
=
self
.
get_success
(
event_creation_handler
.
create_event
(
requester
,
self
.
event_creation_handler
.
create_event
(
self
.
requester
,
{
"
type
"
:
"
m.room.message
"
,
"
room_id
"
:
room_id
,
"
room_id
"
:
self
.
room_id
,
"
content
"
:
{
"
msgtype
"
:
"
m.text
"
,
"
body
"
:
"
helo
"
,
},
"
sender
"
:
alice
,
"
sender
"
:
self
.
alice
,
},
)
)
...
...
@@ -77,39 +100,29 @@ class TestBulkPushRuleEvaluator(HomeserverTestCase):
@override_config
({
"
push
"
:
{
"
enabled
"
:
False
}})
def
test_action_for_event_by_user_disabled_by_config
(
self
)
->
None
:
"""
Ensure that push rules are not calculated when disabled in the config
"""
# Create a new user and room.
alice
=
self
.
register_user
(
"
alice
"
,
"
pass
"
)
token
=
self
.
login
(
alice
,
"
pass
"
)
room_id
=
self
.
helper
.
create_room_as
(
alice
,
room_version
=
RoomVersions
.
V9
.
identifier
,
tok
=
token
)
# Alter the power levels in that room to include stringy and floaty levels.
# We need to suppress the validation logic or else it will reject these dodgy
# values. (Presumably this validation was not always present.)
event_creation_handler
=
self
.
hs
.
get_event_creation_handler
()
requester
=
create_requester
(
alice
)
# Create a new message event, and try to evaluate it under the dodgy
# power level event.
# Create a new message event which should cause a notification.
event
,
context
=
self
.
get_success
(
event_creation_handler
.
create_event
(
requester
,
self
.
event_creation_handler
.
create_event
(
self
.
requester
,
{
"
type
"
:
"
m.room.message
"
,
"
room_id
"
:
room_id
,
"
room_id
"
:
self
.
room_id
,
"
content
"
:
{
"
msgtype
"
:
"
m.text
"
,
"
body
"
:
"
helo
"
,
},
"
sender
"
:
alice
,
"
sender
"
:
self
.
alice
,
},
)
)
bulk_evaluator
=
BulkPushRuleEvaluator
(
self
.
hs
)
# Mock the method which calculates push rules -- we do this instead of
# e.g. checking the results in the database because we want to ensure
# that code isn't even running.
bulk_evaluator
.
_action_for_event_by_user
=
simple_async_mock
()
# type: ignore[assignment]
# should not raise
# Ensure no actions are generated!
self
.
get_success
(
bulk_evaluator
.
action_for_events_by_user
([(
event
,
context
)]))
bulk_evaluator
.
_action_for_event_by_user
.
assert_not_called
()
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