From 2dc82eb448ce90c268fe8db5c4496a916a575255 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Fri, 18 Aug 2023 16:37:25 +0100 Subject: [PATCH] Put synapse config in the tree --- .github/workflows/dmr-test-ci.yml | 20 -------------------- tests-e2e/run-tests-dmr-test.sh | 2 +- tests-e2e/synapse-homeserver.yaml | 13 +++++++++++++ 3 files changed, 14 insertions(+), 21 deletions(-) create mode 100644 tests-e2e/synapse-homeserver.yaml diff --git a/.github/workflows/dmr-test-ci.yml b/.github/workflows/dmr-test-ci.yml index 3ff05b3d..a7c30894 100644 --- a/.github/workflows/dmr-test-ci.yml +++ b/.github/workflows/dmr-test-ci.yml @@ -55,26 +55,6 @@ jobs: pip install -r tests-e2e/synapse-requirements.txt pip list - - name: Configure Synapse - shell: bash - run: | - mkdir synapse - echo < synapse/homeserver.yaml - - name: Run end-to-end tests run: | set -euo pipefail diff --git a/tests-e2e/run-tests-dmr-test.sh b/tests-e2e/run-tests-dmr-test.sh index 44b1f8dc..899e540a 100755 --- a/tests-e2e/run-tests-dmr-test.sh +++ b/tests-e2e/run-tests-dmr-test.sh @@ -4,7 +4,7 @@ export SYNCV3_ADDR='http://localhost:8844' export SYNCV3_DEBUG=1 # Run synapse and stop it afterwards. -python -m synapse.app.homeserver -c synapse/homeserver.yaml & +python -m synapse.app.homeserver -c synapse-homeserver.yaml & SYNAPSE_PID=$! # Run the binary and stop it afterwards. diff --git a/tests-e2e/synapse-homeserver.yaml b/tests-e2e/synapse-homeserver.yaml new file mode 100644 index 00000000..28c2e9b8 --- /dev/null +++ b/tests-e2e/synapse-homeserver.yaml @@ -0,0 +1,13 @@ +server_name: "exampledomain" +listeners: +- port: 8008 + type: http + bind_addresses: ['::1', '127.0.0.1'] + resources: + - names: [client] +database: +name: sqlite3 +args: + database: synapse/homeserver.db +suppress_key_server_warning: true +report_stats: false