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.31.0 into dinsic #1038

Merged
merged 39 commits into from
Apr 28, 2021

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Apr 23, 2021

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

This merge is paired with the equivalent Synapse PR: TBA

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

There wasn't a release branch for v1.31.0 😬, so I just merged up to the commit that was the HEAD of Sytest master branch when Synapse v1.31.0 was released.

clokep and others added 30 commits December 4, 2020 09:56
In preparation for removing the deprecated `shutdown_room` API.
…990)

This matches better behavior of how SSO works by having SSO users login
instead of being "upgraded" from a normal user to an SSO user.
 - Ignore .DS_Store from macOS
 - Ignore db files that can get generated from running
According to matrix-org/dendrite@bf7e858

Signed-off-by: Bohdan Horbeshko <bodqhrohro@gmail.com>
…rver

Rename serverkeyapi to signingkeyserver
…sytest-docs

Use Dendrite docs as source of truth for Sytest
Ignore generated files when running on macOS
Add docs for an easy pitfall to fall into when you run against
the Synapse source and don't activate your virtualenv in your
Sytest terminal window
Previously the tests depended on deleting the pusher and 
checking that a 404 was returned, which is not specced
behavior.
Look for sender not user_id in various tests
Ensure the `public_baseurl` setting matches what is queried by sytest.
#945 removed the pydron script, but apparently failed to remove it from the dockerfile.
These are based on Debian Bullseye.

As of last month, Bullseye ships Python 3.9:

  https://packages.debian.org/bullseye/python3

  https://tracker.debian.org/news/1199188/python3-defaults-390-4-migrated-to-testing/

Signed-off-by: Dan Callahan <danc@element.io>
Make sure that stderr and stdout get correctly caught and logged, to help diagnose mysterious "failed to start server" errors. Things written direct to stderr tend to get overwritten by other diagnostic output, so use the proper `Output::diag` method.

Previously, stderr was being caught and returned in the failure, which wasn't terribly clear, while stdout went to /dev/null.
This was getting to be a bit of a mess, with unused/duplicate functions, and undocumented methods named the same as undocumented fields with different functions. Clean it all up.
richvdh and others added 9 commits February 24, 2021 17:00
* Send the right Host header for custom ports

Synapse now expects the Host header to match the public_baseurl for some
requests, so let's make sure we set it correctly.

* Set `x_forwarded` config on HTTP listeners behind haproxy

Remove the unused "unsecure" listener in monolith mode, and configure it
properly for worker mode.

* Set X-Forwarded-Proto in haproxy

Synapse is going to depend on this now.
* Use  type => "m.login.application_service",1~type => "m.login.application_service",

* Add missing registration type in 02ghost.pl

Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
* Remove Debian Stretch containers

Renames remaining containers based on underlying Debian distro to be a
bit more explicit about the testing environment.

Fixes #1003

Signed-off-by: Dan Callahan <danc@element.io>
@anoadragon453 anoadragon453 merged commit 6f825a5 into dinsic Apr 28, 2021
@anoadragon453 anoadragon453 deleted the anoa/dinsic_release_1_31_0 branch April 28, 2021 09:07
@anoadragon453
Copy link
Member Author

This PR accidentally included #902, which landed in develop a little while ago. Merging #902 from develop into dinsic ended up reverting the necessary changes in #900 on the dinsic branch.

4f03e7b was pushed to dinsic to fix this.

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.