This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into add-openid-userinfo-fields
- Loading branch information
Showing
596 changed files
with
25,214 additions
and
9,625 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Test for the export-data admin command against sqlite and postgres | ||
|
||
set -xe | ||
cd "$(dirname "$0")/../.." | ||
|
||
echo "--- Install dependencies" | ||
|
||
# Install dependencies for this test. | ||
pip install psycopg2 | ||
|
||
# Install Synapse itself. This won't update any libraries. | ||
pip install -e . | ||
|
||
echo "--- Generate the signing key" | ||
|
||
# Generate the server's signing key. | ||
python -m synapse.app.homeserver --generate-keys -c .ci/sqlite-config.yaml | ||
|
||
echo "--- Prepare test database" | ||
|
||
# Make sure the SQLite3 database is using the latest schema and has no pending background update. | ||
scripts/update_synapse_database --database-config .ci/sqlite-config.yaml --run-background-updates | ||
|
||
# Run the export-data command on the sqlite test database | ||
python -m synapse.app.admin_cmd -c .ci/sqlite-config.yaml export-data @anon-20191002_181700-832:localhost:8800 \ | ||
--output-directory /tmp/export_data | ||
|
||
# Test that the output directory exists and contains the rooms directory | ||
dir="/tmp/export_data/rooms" | ||
if [ -d "$dir" ]; then | ||
echo "Command successful, this test passes" | ||
else | ||
echo "No output directories found, the command fails against a sqlite database." | ||
exit 1 | ||
fi | ||
|
||
# Create the PostgreSQL database. | ||
.ci/scripts/postgres_exec.py "CREATE DATABASE synapse" | ||
|
||
# Port the SQLite databse to postgres so we can check command works against postgres | ||
echo "+++ Port SQLite3 databse to postgres" | ||
scripts/synapse_port_db --sqlite-database .ci/test_db.db --postgres-config .ci/postgres-config.yaml | ||
|
||
# Run the export-data command on postgres database | ||
python -m synapse.app.admin_cmd -c .ci/postgres-config.yaml export-data @anon-20191002_181700-832:localhost:8800 \ | ||
--output-directory /tmp/export_data2 | ||
|
||
# Test that the output directory exists and contains the rooms directory | ||
dir2="/tmp/export_data2/rooms" | ||
if [ -d "$dir2" ]; then | ||
echo "Command successful, this test passes" | ||
else | ||
echo "No output directories found, the command fails against a postgres database." | ||
exit 1 | ||
fi |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,2 @@ | ||
# This file serves as a blacklist for SyTest tests that we expect will fail in | ||
# Synapse when run under worker mode. For more details, see sytest-blacklist. | ||
|
||
Can re-join room if re-invited | ||
|
||
# new failures as of https://github.com/matrix-org/sytest/pull/732 | ||
Device list doesn't change if remote server is down | ||
|
||
# https://buildkite.com/matrix-dot-org/synapse/builds/6134#6f67bf47-e234-474d-80e8-c6e1868b15c5 | ||
Server correctly handles incoming m.device_list_update |
Validating CODEOWNERS rules …
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# Automatically request reviews from the synapse-core team when a pull request comes in. | ||
* @matrix-org/synapse-core |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
### Pull Request Checklist | ||
|
||
<!-- Please read CONTRIBUTING.md before submitting your pull request --> | ||
<!-- Please read https://matrix-org.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> | ||
|
||
* [ ] Pull request is based on the develop branch | ||
* [ ] Pull request includes a [changelog file](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#changelog). The entry should: | ||
* [ ] Pull request includes a [changelog file](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: | ||
- Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". | ||
- Use markdown where necessary, mostly for `code blocks`. | ||
- End with either a period (.) or an exclamation mark (!). | ||
- Start with a capital letter. | ||
* [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off) | ||
* [ ] Code style is correct (run the [linters](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#code-style)) | ||
* [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off) | ||
* [ ] [Code style](https://matrix-org.github.io/synapse/latest/code_style.html) is correct | ||
(run the [linters](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#run-the-linters)) |
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,7 @@ __pycache__/ | |
/.coverage* | ||
/.mypy_cache/ | ||
/.tox | ||
/.tox-pg-container | ||
/build/ | ||
/coverage.* | ||
/dist/ | ||
|
Oops, something went wrong.