summary refs log tree commit diff
path: root/tests/push/test_email.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:13:42 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:13:42 +0100
commitdf77da8b4d9b3eafa0f2a4d514f64251f28a4135 (patch)
tree16e14e3fc8adb8856bab4b5320769df6434a34c8 /tests/push/test_email.py
parentMerge commit 'eadfda3eb' into anoa/dinsic_release_1_21_x (diff)
parentReduce run-times of tests by advancing the reactor less (#7757) (diff)
downloadsynapse-df77da8b4d9b3eafa0f2a4d514f64251f28a4135.tar.xz
Merge commit 'a466b6797' into anoa/dinsic_release_1_21_x
* commit 'a466b6797':
  Reduce run-times of tests by advancing the reactor less (#7757)
  Update debian systemd service to use Type=notify (#8169)
  Remove remaining is_guest argument uses from get_room_data calls (#8181)
  Do not propagate typing notifications from shadow-banned users. (#8176)
  Remove unused parameter from, and add safeguard in, get_room_data (#8174)
  Add required Debian dependencies to allow docker builds on the arm platform (#8144)
  Allow running mypy directly. (#8175)
  Update the test federation client to handle streaming responses (#8130)
  Do not propagate profile changes of shadow-banned users into rooms. (#8157)
  Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator (#8171)
  Convert simple_select_one and simple_select_one_onecol to async (#8162)
Diffstat (limited to 'tests/push/test_email.py')
-rw-r--r--tests/push/test_email.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py

index 83032cc9ea..227b0d32d0 100644 --- a/tests/push/test_email.py +++ b/tests/push/test_email.py
@@ -170,7 +170,7 @@ class EmailPusherTests(HomeserverTestCase): last_stream_ordering = pushers[0]["last_stream_ordering"] # Advance time a bit, so the pusher will register something has happened - self.pump(100) + self.pump(10) # It hasn't succeeded yet, so the stream ordering shouldn't have moved pushers = self.get_success(