summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-12-05 00:13:41 +0100
committerGitHub <noreply@github.com>2019-12-05 00:13:41 +0100
commit25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1 (patch)
tree4affb0579dba29b9e5ad96b31c263c8d6f642f69 /nixos
parenta2f9bcd1328de9c043d7425e45d06fc05e0b7929 (diff)
parent0168f41d70a1e36daf160407def482ca4d65e4fd (diff)
downloadnixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar.gz
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar.bz2
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar.lz
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar.xz
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.tar.zst
nixpkgs-25f7bd7c4bfb3f8d527daf6a0f62efca8cc033d1.zip
Merge pull request #74753 from mmilata/moinmoin-python-test
nixosTests.moinmoin: port to python
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/moinmoin.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/nixos/tests/moinmoin.nix b/nixos/tests/moinmoin.nix
index 2662b79aa09..ac327498eba 100644
--- a/nixos/tests/moinmoin.nix
+++ b/nixos/tests/moinmoin.nix
@@ -1,6 +1,6 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "moinmoin";
-  meta.maintainers = [ ]; # waiting for https://github.com/NixOS/nixpkgs/pull/65397
+  meta.maintainers = with lib.maintainers; [ mmilata ];
 
   machine =
     { ... }:
@@ -13,12 +13,16 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
     };
 
   testScript = ''
-    startAll;
+    start_all()
 
-    $machine->waitForUnit('moin-ExampleWiki.service');
-    $machine->waitForUnit('nginx.service');
-    $machine->waitForFile('/run/moin/ExampleWiki/gunicorn.sock');
-    $machine->succeed('curl -L http://localhost/') =~ /If you have just installed/ or die;
-    $machine->succeed('moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1') =~ /status success/ or die;
+    machine.wait_for_unit("moin-ExampleWiki.service")
+    machine.wait_for_unit("nginx.service")
+    machine.wait_for_file("/run/moin/ExampleWiki/gunicorn.sock")
+
+    assert "If you have just installed" in machine.succeed("curl -L http://localhost/")
+
+    assert "status success" in machine.succeed(
+        "moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1"
+    )
   '';
 })