From fc01bc08fafe82b254f7562b55209c872297fac6 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 29 May 2022 08:52:20 +0200
Subject: Refresh and organise run-tests.sh/adjust-config.sh

run-tests.sh now uses the latest version of Synapse and has less
repetitive code; adjust-config.sh moved to autotests/ (it had nothing
specific to CI, after all), works with the newest Synapse (that has
an additional enable_registration_without_verification safeguard) and
no more depends on the config directory being called "data" but rather
should be called from inside that directory (for the case when it is
used separately from run-tests.sh and the config directory is not
called "data").
---
 autotests/adjust-config.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 autotests/adjust-config.sh

(limited to 'autotests/adjust-config.sh')

diff --git a/autotests/adjust-config.sh b/autotests/adjust-config.sh
new file mode 100644
index 00000000..a55ac670
--- /dev/null
+++ b/autotests/adjust-config.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+CMD=""
+
+$CMD perl -pi -w -e \
+    's/rc_messages_per_second.*/rc_messages_per_second: 1000/g;' homeserver.yaml
+$CMD perl -pi -w -e \
+    's/rc_message_burst_count.*/rc_message_burst_count: 10000/g;' homeserver.yaml
+
+(
+cat <<HEREDOC
+rc_message:
+  per_second: 10000
+  burst_count: 100000
+rc_registration:
+  per_second: 10000
+  burst_count: 30000
+rc_login:
+  address:
+    per_second: 10000
+    burst_count: 30000
+  account:
+    per_second: 10000
+    burst_count: 30000
+  failed_attempts:
+    per_second: 10000
+    burst_count: 30000
+rc_admin_redaction:
+  per_second: 1000
+  burst_count: 5000
+rc_joins:
+  local:
+    per_second: 10000
+    burst_count: 100000
+  remote:
+    per_second: 10000
+    burst_count: 100000
+HEREDOC
+) | $CMD tee -a data/homeserver.yaml
+
+$CMD perl -pi -w -e \
+    's/^#enable_registration: false/enable_registration: true/g;' homeserver.yaml
+$CMD perl -pi -w -e \
+    's/^#enable_registration_without_verification: .+/enable_registration_without_verification: true/g;' homeserver.yaml
+$CMD perl -pi -w -e \
+    's/tls: false/tls: true/g;' homeserver.yaml
+$CMD perl -pi -w -e \
+    's/#tls_certificate_path:/tls_certificate_path:/g;' homeserver.yaml
+$CMD perl -pi -w -e \
+    's/#tls_private_key_path:/tls_private_key_path:/g;' homeserver.yaml
+
+$CMD openssl req -x509 -newkey rsa:4096 -keyout localhost.tls.key -out localhost.tls.crt -days 365 -subj '/CN=localhost' -nodes
+
+$CMD chmod 0777 localhost.tls.crt
+$CMD chmod 0777 localhost.tls.key
-- 
cgit v1.2.3


From 8a868988be0c5ce4ea8a22f4a6f8c7e8b2e42037 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 29 May 2022 23:01:09 +0200
Subject: run-tests.sh: fix weird CI failure on Linux/Clang

Also fix a leftover data/ prefix in adjust-config.sh
---
 autotests/adjust-config.sh | 2 +-
 autotests/run-tests.sh     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'autotests/adjust-config.sh')

diff --git a/autotests/adjust-config.sh b/autotests/adjust-config.sh
index a55ac670..68ea58ab 100644
--- a/autotests/adjust-config.sh
+++ b/autotests/adjust-config.sh
@@ -36,7 +36,7 @@ rc_joins:
     per_second: 10000
     burst_count: 100000
 HEREDOC
-) | $CMD tee -a data/homeserver.yaml
+) | $CMD tee -a homeserver.yaml
 
 $CMD perl -pi -w -e \
     's/^#enable_registration: false/enable_registration: true/g;' homeserver.yaml
diff --git a/autotests/run-tests.sh b/autotests/run-tests.sh
index a3ee2ade..05a215af 100755
--- a/autotests/run-tests.sh
+++ b/autotests/run-tests.sh
@@ -4,9 +4,7 @@ chmod 0777 data
 rm ~/.local/share/testolmaccount -rf
 docker run -v `pwd`/data:/data --rm \
     -e SYNAPSE_SERVER_NAME=localhost -e SYNAPSE_REPORT_STATS=no matrixdotorg/synapse:latest generate
-pushd data
-. ../autotests/adjust-config.sh
-popd
+(cd data && . ../autotests/adjust-config.sh)
 docker run -d \
     --name synapse \
     -p 1234:8008 \
-- 
cgit v1.2.3