This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Fix client reader sharding tests #7853
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
clokep
reviewed
Jul 15, 2020
Co-authored-by: Patrick Cloke <[email protected]>
clokep
reviewed
Jul 15, 2020
tests/replication/_base.py
Outdated
|
|
||
| return resource | ||
|
|
||
| def make_worker_hs(self, worker_app: str, extra_config={}) -> HomeServer: |
There was a problem hiding this comment.
Is it worth mentioning that this uses a mock for the HTTP client that can be used to assert calls back to the primary process?
While we're here can we add a type hint for extra_config?
There was a problem hiding this comment.
I've docced and typed this properly now. I actually decided that it was cleaner to have a **kwargs that we can pass through to setup_test_homeserver so that different tests can easily mock out different things (e.g. the pusher sharding test I'm writing needs to mock out a different http client)
There was a problem hiding this comment.
Yeah, that makes sense. Could also be better to sub-class this in a test-case if you want them all to have the same config.
clokep
approved these changes
Jul 15, 2020
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit 'a973bcb8a': Add some tiny type annotations (#7870) Remove obsolete comment. Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836) Avoid brand new rooms in `delete_old_current_state_events` (#7854) Allow accounts to be re-activated from the admin APIs. (#7847) Fix tests Fix typo Newsfile Use get_users_in_room rather than state handler in typing for speed Fix client reader sharding tests (#7853) Convert E2E key and room key handlers to async/await. (#7851) Return the proper 403 Forbidden error during errors with JWT logins. (#7844) remove `retry_on_integrity_error` wrapper for persist_events (#7848)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a bug in the client reader sharding tests where the register requests were always going to master instead of the workers (due to a typo in using
self.resourcerather thanresource). Fixing that leads to timeouts as the/registerpaths try and send a HTTP replication request to master, which we didn't handle.Currently, the tests are set up so that you need to explicitly call
self.handle_http_replication_attempt()after a connection attempt has been made. This is impossible to do if sending a request, asrenderblocks until the request is completed. We could solve this by trying and making it possible torendercallself.handle_http_replication_attemptat the same time, but it feels nicer to instead have the test base class automatically handle the http replication call.All in all, this PR:
tests/replication/)tests/server.py)tests/replication/_base.py)synapse/http/client.py)