Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge mainline release v1.24.0 into dinsic #999

Merged
merged 22 commits into from
Jan 4, 2021

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Dec 31, 2020

Updating DINUM's sytest branch from v1.21.2 -> v1.24.0.

This merge is paired with the equivalent Synapse PR: matrix-org/synapse-dinsic#75

Note: CI is expected to fail. Check the proper CI runs in the Synapse PR.

erikjohnston and others added 22 commits October 6, 2020 14:55
Instead of using a python script to run multiple synapse workers we may as well do that in sytest. This just makes things easier to extend.
this seems to have looped waiting for presence to turn up ever since it was
first written, but as far as I can tell, the loop has never done anything,
because where we don't know presence, we always make up an "offline" status.

Anyway, this seems to make it more reliable.
This test seemed to be trying to check for profile info, but actually checking
for presence.

This seems to go all the way back to bbad767.
A follow-up from #965, in which it turns out I didn't really know what I was
doing. Anyway, I think I've *really* deflaked this one this time.
…tionship when breaking sig (otherwise the test triggers *other* problems) (#963)
make sure that we pass SIGINTs and SIGTERMs through to the perl process, so
that `docker stop` and ctrl-c actually stop the test runs.
This makes SyTest test Synapse's sharded event persister set up
… not cause room join to fail" (#973)

* Fix "Event with an invalid signature in the send_join response should not cause room join to fail"

* Indentation, again, damnit
Seems to have broken in #972
otherwise it gets swallowed.

That means we can remove the same pattern from all the other places we have it.
For the second time this week (#972 and #973), I've found myself wondering why
a test was failing and discovered that it is due to it relying on new
functionality in Future 0.45. I guess we may as well bump the dep as try to
keep our tests backwards-compatible, particularly given the CI uses the latest
version.
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
* Mark admin tests as Synapse-specific

* Match just the first part of the implementation name

* Let's try that again

* Declare tokens

* Scalar vs list etc

* Invert the check

* Fat-fingered

* Less magic

* Define implementation_name for all

* whois is actually in the spec

* Add commented stub, try without implementation_name in ViaHaproxy/Monolith
@anoadragon453 anoadragon453 changed the base branch from develop to dinsic December 31, 2020 18:25
@anoadragon453 anoadragon453 merged commit ab06dc7 into dinsic Jan 4, 2021
@anoadragon453 anoadragon453 deleted the anoa/dinsic_release_1_24_0 branch January 4, 2021 02:58
anoadragon453 added a commit to matrix-org/synapse-dinsic that referenced this pull request Jan 4, 2021
Updating DINUM's synapse branch from v1.21.2 -> v1.24.0.

Shouldn't be any deprecations or config file changes to worry about.

This merge is paired with one for Sytest as well: matrix-org/sytest#999
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants