pyrox.dev
nixos/tests/matrix-synapse: fix test (#45596)
Since matrix-synapse 0.33.0 underscores in server names are rejected
by server name validation, causing the test to fail:
valueError: Server name 'server_sqlite' contains invalid characters
Relevant upstream change:
https://github.com/matrix-org/synapse/commit/546bc9e28b3d7758c732df8e120639d58d455164
+9
-8
nixos/tests/matrix-synapse.nix
+9
-8
nixos/tests/matrix-synapse.nix
···
6
};
7
8
nodes = {
9
-
server_postgres = args: {
10
services.matrix-synapse.enable = true;
11
services.matrix-synapse.database_type = "psycopg2";
12
};
13
14
-
server_sqlite = args: {
15
services.matrix-synapse.enable = true;
16
services.matrix-synapse.database_type = "sqlite3";
17
};
···
19
20
testScript = ''
21
startAll;
22
-
$server_postgres->waitForUnit("matrix-synapse.service");
23
-
$server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
24
-
$server_postgres->requireActiveUnit("postgresql.service");
25
-
$server_sqlite->waitForUnit("matrix-synapse.service");
26
-
$server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
27
-
$server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
28
'';
29
30
})
···
6
};
7
8
nodes = {
9
+
# Since 0.33.0, matrix-synapse doesn't allow underscores in server names
10
+
serverpostgres = args: {
11
services.matrix-synapse.enable = true;
12
services.matrix-synapse.database_type = "psycopg2";
13
};
14
15
+
serversqlite = args: {
16
services.matrix-synapse.enable = true;
17
services.matrix-synapse.database_type = "sqlite3";
18
};
···
20
21
testScript = ''
22
startAll;
23
+
$serverpostgres->waitForUnit("matrix-synapse.service");
24
+
$serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
25
+
$serverpostgres->requireActiveUnit("postgresql.service");
26
+
$serversqlite->waitForUnit("matrix-synapse.service");
27
+
$serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
28
+
$serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
29
'';
30
31
})