From 0168f41d70a1e36daf160407def482ca4d65e4fd Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sat, 30 Nov 2019 23:55:22 +0100 Subject: [PATCH] nixosTests.moinmoin: port to python --- nixos/tests/moinmoin.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/tests/moinmoin.nix b/nixos/tests/moinmoin.nix index 2662b79aa0995e..ac327498eba0f7 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" + ) ''; })