public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/matrix-synapse: fix test (#45596)

Browse Source 
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:
546bc9e28b
This commit is contained in:
xeji 2018-08-26 10:38:52 +02:00 committed by GitHub
parent b7e0c40d29
commit 3050406388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/tests/matrix-synapse.nix
View File

@ -6,12 +6,13 @@ import ./make-test.nix ({ pkgs, ... } : {
}; };
nodes = { nodes = {
server_postgres = args: { # Since 0.33.0, matrix-synapse doesn't allow underscores in server names
serverpostgres = args: {
services.matrix-synapse.enable = true; services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "psycopg2"; services.matrix-synapse.database_type = "psycopg2";
}; };
server_sqlite = args: { serversqlite = args: {
services.matrix-synapse.enable = true; services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "sqlite3"; services.matrix-synapse.database_type = "sqlite3";
}; };
@ -19,12 +20,12 @@ import ./make-test.nix ({ pkgs, ... } : {
testScript = '' testScript = ''
startAll; startAll;
$server_postgres->waitForUnit("matrix-synapse.service"); $serverpostgres->waitForUnit("matrix-synapse.service");
$server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$server_postgres->requireActiveUnit("postgresql.service"); $serverpostgres->requireActiveUnit("postgresql.service");
$server_sqlite->waitForUnit("matrix-synapse.service"); $serversqlite->waitForUnit("matrix-synapse.service");
$server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
''; '';
}) })