about summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-10-09 14:36:56 +0000
committerGitHub <noreply@github.com>2019-10-09 14:36:56 +0000
commitf024e7b769df17b24e98013f1866dc7a908d30ab (patch)
tree8b718dbf088d50c52f478590dd2ab0bec5e3132d /nixos/tests
parentff0148d868bddd3e20db4c8788190b0037d3de97 (diff)
parent176b1aeb4ee17f6ab7d5bb9275514d900e848ec1 (diff)
downloadnixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar.gz
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar.bz2
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar.lz
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar.xz
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.tar.zst
nixlib-f024e7b769df17b24e98013f1866dc7a908d30ab.zip
Merge pull request #67890 from mguentner/mxisd_ma1sd
mxisd: 1.4.5 -> 1.4.6 ☺ ma1sd: init at 2.1.1
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/mxisd.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/tests/mxisd.nix b/nixos/tests/mxisd.nix
index 3d03a5a53e38..0039256f5861 100644
--- a/nixos/tests/mxisd.nix
+++ b/nixos/tests/mxisd.nix
@@ -10,12 +10,22 @@ import ./make-test.nix ({ pkgs, ... } : {
       services.mxisd.enable = true;
       services.mxisd.matrix.domain = "example.org";
     };
+
+    server_ma1sd = args : {
+      services.mxisd.enable = true;
+      services.mxisd.matrix.domain = "example.org";
+      services.mxisd.package = pkgs.ma1sd;
+    };
   };
 
   testScript = ''
     startAll;
     $server_mxisd->waitForUnit("mxisd.service");
     $server_mxisd->waitForOpenPort(8090);
-    $server_mxisd->succeed("curl -Ssf \"http://127.0.0.1:8090/_matrix/identity/api/v1\"")
+    $server_mxisd->succeed("curl -Ssf \"http://127.0.0.1:8090/_matrix/identity/api/v1\"");
+    $server_ma1sd->waitForUnit("mxisd.service");
+    $server_ma1sd->waitForOpenPort(8090);
+    $server_ma1sd->succeed("curl -Ssf \"http://127.0.0.1:8090/_matrix/identity/api/v1\"")
+
   '';
 })