Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Merge mainline release v1.15.1 into dinsic #50

Merged
merged 63 commits into from
Jun 24, 2020
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ef884f6
Convert identity handler to async/await. (#7561)
clokep May 26, 2020
9848389
Merge branch 'develop' of github.com:matrix-org/synapse into develop
babolivier May 26, 2020
0a6e837
Fix incorrect placeholder syntax in database prepartion code (#7575)
anoadragon453 May 27, 2020
5af572a
Merge tag 'v1.14.0rc2' into develop
babolivier May 27, 2020
c4a820b
allow emails to be passed through SAML (#7385)
cg505 May 27, 2020
35c3087
Speed up processing of federation stream RDATA rows.
erikjohnston May 27, 2020
a6a40a1
Newsfile
erikjohnston May 27, 2020
a72d5f3
Add test for Linearizer.is_queued(..)
erikjohnston May 27, 2020
3d7f1b5
Remove spurious change
erikjohnston May 27, 2020
ef3934e
Ensure we persist and ack the same token
erikjohnston May 27, 2020
8c5f88f
Merge pull request #7584 from matrix-org/erikj/save_and_send_fed_toke…
erikjohnston May 27, 2020
5cb470b
Merge branch 'master' into develop
babolivier May 28, 2020
47db2c3
Add entry to set dependency against psql service (#7591)
drio May 28, 2020
f5353ef
Make inflight background metrics more efficient. (#7597)
erikjohnston May 29, 2020
cb495f5
Fix 'FederationGroupsRoomsServlet' API when group has room server is …
erikjohnston May 29, 2020
91a7c5f
Update OpenBSD installation instructions (#7587)
hashashini May 30, 2020
2dc430d
Use upsert when inserting read receipts (#7607)
ilmari Jun 1, 2020
c1bdd4f
Don't fail all of an iteration of the device list retry loop on error…
babolivier Jun 1, 2020
6af9cdc
Convert groups local and server to async/await. (#7600)
clokep Jun 1, 2020
df8a3ce
Improve performance of _get_state_groups_from_groups_txn (#7567)
ilmari Jun 1, 2020
901b1fa
Email notifications for new users when creating via the Admin API. (#…
dklimpel Jun 1, 2020
33c39ab
Process cross-signing keys when resyncing device lists (#7594)
babolivier Jun 1, 2020
fe434cd
Fix a bug in automatic user creation with m.login.jwt. (#7585)
olof Jun 1, 2020
25e2d19
Advertise Python 3.8 support in setup.py (#7602)
anoadragon453 Jun 1, 2020
3e55744
Mention #synapse:matrix.org in README troubleshooting (#7603)
anoadragon453 Jun 1, 2020
816589b
update grafana dashboard
richvdh Jun 2, 2020
1bbc9e2
Clean up exception handling in SAML2ResponseResource (#7614)
richvdh Jun 3, 2020
3820c24
Merge branch 'master' into develop
richvdh Jun 3, 2020
2a8ed93
Switch back to upstream dh-virtualenv (#7621)
richvdh Jun 3, 2020
38d4ebb
`synctl restart` should start synapse if it wasn't running (#7624)
richvdh Jun 3, 2020
11dc2b4
Fix exceptions when fetching events from a down host. (#7622)
erikjohnston Jun 3, 2020
c9507be
Check if the localpart is reserved for guests earlier in the registra…
babolivier Jun 3, 2020
0188daf
Replace instances of reactor pumping with get_success. (#7619)
anoadragon453 Jun 3, 2020
86d814c
Check the changelog number in check-newsfragment (#7623)
richvdh Jun 3, 2020
e91abfd
async/await get_user_id_by_threepid (#7620)
anoadragon453 Jun 3, 2020
11de843
Cleanups to the OpenID Connect integration (#7628)
richvdh Jun 3, 2020
f8b9ead
Advertise the token login type when OpenID Connect is enabled. (#7631)
clokep Jun 4, 2020
c389bfb
Fix encryption algorithm typos in tests/comments (#7637)
anoadragon453 Jun 4, 2020
f4e6495
Performance improvements and refactor of Ratelimiter (#7595)
anoadragon453 Jun 5, 2020
e55ee7c
Add support for webp thumbnailing (#7586)
WGH- Jun 5, 2020
139bc86
Support CS API v0.6.0 (#6585)
anoadragon453 Jun 5, 2020
02f345d
Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flak…
clokep Jun 5, 2020
2970ce8
Add device management to admin API (#7481)
dklimpel Jun 5, 2020
908f9e2
Allow new users to be registered via the admin API even if the monthl…
dklimpel Jun 5, 2020
f1e61ef
Typo fixes.
clokep Jun 5, 2020
b4f8dcb
Remove some unused constants. (#7644)
richvdh Jun 5, 2020
eea1243
Fix type information on `assert_*_is_admin` methods (#7645)
richvdh Jun 5, 2020
a0d2d81
Update to the stable SSO prefix for UI Auth. (#7630)
clokep Jun 5, 2020
1bc00fd
Clarifications to the admin api documentation (#7647)
richvdh Jun 5, 2020
0909931
Add an option to disable autojoin for guest accounts (#6637)
turt2live Jun 5, 2020
737b4a9
Convert user directory handler and related classes to async/await. (#…
clokep Jun 5, 2020
375ca0c
Accept device information at the login fallback endpoint. (#7629)
clokep Jun 8, 2020
3c45a78
Convert the registration handler to async/await. (#7649)
clokep Jun 8, 2020
664409b
Fix bug in account data replication stream. (#7656)
erikjohnston Jun 9, 2020
8587b04
1.15.0rc1
babolivier Jun 9, 2020
2dc9468
Revert "1.15.0rc1"
babolivier Jun 9, 2020
236d2d6
1.15.0rc1
babolivier Jun 9, 2020
3e8c854
Update CHANGES.md
richvdh Jun 9, 2020
737530a
Fix some attributions
babolivier Jun 9, 2020
1cd6779
Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into …
babolivier Jun 9, 2020
3b3f327
1.15.0
babolivier Jun 11, 2020
a7d49db
Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into …
anoadragon453 Jun 24, 2020
b213313
Changelog
anoadragon453 Jun 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for Linearizer.is_queued(..)
  • Loading branch information
erikjohnston committed May 27, 2020
commit a72d5f39db55dfecb48291acdd6566c6556e0b0b
32 changes: 32 additions & 0 deletions tests/util/test_linearizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,38 @@ def test_linearizer(self):
with (yield d2):
pass

@defer.inlineCallbacks
def test_linearizer_is_queued(self):
linearizer = Linearizer()

key = object()

d1 = linearizer.queue(key)
cm1 = yield d1

# Since d1 gets called immediately, "is_queued" should return false.
self.assertFalse(linearizer.is_queued(key))

d2 = linearizer.queue(key)
self.assertFalse(d2.called)

# Now d2 is queued up behind successful completion of cm1
self.assertTrue(linearizer.is_queued(key))

with cm1:
self.assertFalse(d2.called)

# cm1 still not done, so d2 still queued.
self.assertTrue(linearizer.is_queued(key))

# And now d2 is called and nothing is in the queue again
self.assertFalse(linearizer.is_queued(key))

with (yield d2):
self.assertFalse(linearizer.is_queued(key))

self.assertFalse(linearizer.is_queued(key))

def test_lots_of_queued_things(self):
# we have one slow thing, and lots of fast things queued up behind it.
# it should *not* explode the stack.
Expand Down