diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:20:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:26:53 +0100 |
| commit | 457e94d9008a55f0302100b00b77ea9ea478eaef (patch) | |
| tree | fa6c4caad3cd47fcff78421a553086cd49dc9f54 /nixos/tests/moodle.nix | |
| parent | 4fc27edf074b63a46782832279f8ac1c27b43829 (diff) | |
| parent | 5e70be026ee4eb05ed1c25d659848ab2f7102100 (diff) | |
| download | nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.gz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.bz2 nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.lz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.xz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.zst nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.zip | |
Merge branch 'master' into staging-next
~4k rebuilds on each Linux.
Diffstat (limited to 'nixos/tests/moodle.nix')
| -rw-r--r-- | nixos/tests/moodle.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix index 565a6b63694..56aa62596c0 100644 --- a/nixos/tests/moodle.nix +++ b/nixos/tests/moodle.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "moodle"; meta.maintainers = [ lib.maintainers.aanderse ]; @@ -15,8 +15,8 @@ import ./make-test.nix ({ pkgs, lib, ... }: { }; testScript = '' - startAll; - $machine->waitForUnit('phpfpm-moodle.service'); - $machine->succeed('curl http://localhost/') =~ /You are not logged in/ or die; + start_all() + machine.wait_for_unit("phpfpm-moodle.service") + machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'") ''; }) |