summary refs log tree commit diff
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-08-26 10:38:52 +0200
committerGitHub <noreply@github.com>2018-08-26 10:38:52 +0200
commit30504063883a4bc341dd49be07be4bdbfd196ee3 (patch)
treec13f47a1e9acc2325192ad4f3d70e42740c78f18
parentb7e0c40d299cfefca2e68db5ab9d3d26b013bdf8 (diff)
downloadnixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar.gz
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar.bz2
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar.lz
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar.xz
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.tar.zst
nixpkgs-30504063883a4bc341dd49be07be4bdbfd196ee3.zip
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
-rw-r--r--nixos/tests/matrix-synapse.nix17
1 files changed, 9 insertions, 8 deletions
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
index 113fb622588..8504a7c0d05 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixos/tests/matrix-synapse.nix
@@ -6,12 +6,13 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   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.database_type = "psycopg2";
     };
 
-    server_sqlite = args: {
+    serversqlite = args: {
       services.matrix-synapse.enable = true;
       services.matrix-synapse.database_type = "sqlite3";
     };
@@ -19,12 +20,12 @@ import ./make-test.nix ({ pkgs, ... } : {
 
   testScript = ''
     startAll;
-    $server_postgres->waitForUnit("matrix-synapse.service");
-    $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
-    $server_postgres->requireActiveUnit("postgresql.service");
-    $server_sqlite->waitForUnit("matrix-synapse.service");
-    $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
-    $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
+    $serverpostgres->waitForUnit("matrix-synapse.service");
+    $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
+    $serverpostgres->requireActiveUnit("postgresql.service");
+    $serversqlite->waitForUnit("matrix-synapse.service");
+    $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
+    $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
   '';
 
 })