@@ -34,7 +34,7 @@ let
3434 };
3535
3636 tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
37− callTest (import ../make-test.nix ({ pkgs, lib, ... }:
37+ callTest (import ../make-test-python.nix ({ pkgs, lib, ... }:
3838 {
3939 name = "hydra-with-${name}";
4040 meta = with pkgs.stdenv.lib.maintainers; {
@@ -73,26 +73,30 @@ let
7373
7474 testScript = ''
7575 # let the system boot up
76− $machine->waitForUnit("multi-user.target");
76+ machine.wait_for_unit("multi-user.target")
7777 # test whether the database is running
78− $machine->waitForUnit("postgresql.service");
78+ machine.wait_for_unit("postgresql.service")
7979 # test whether the actual hydra daemons are running
80− $machine->waitForUnit("hydra-init.service");
81− $machine->requireActiveUnit("hydra-queue-runner.service");
82− $machine->requireActiveUnit("hydra-evaluator.service");
83− $machine->requireActiveUnit("hydra-notify.service");
80+ machine.wait_for_unit("hydra-init.service")
81+ machine.require_unit_state("hydra-queue-runner.service")
82+ machine.require_unit_state("hydra-evaluator.service")
83+ machine.require_unit_state("hydra-notify.service")
8484
85− $machine->succeed("hydra-create-user admin --role admin --password admin");
85+ machine.succeed("hydra-create-user admin --role admin --password admin")
8686
8787 # create a project with a trivial job
88− $machine->waitForOpenPort(3000);
88+ machine.wait_for_open_port(3000)
8989
9090 # make sure the build as been successfully built
91− $machine->succeed("create-trivial-project.sh");
91+ machine.succeed("create-trivial-project.sh")
9292
93− $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq');
93+ machine.wait_until_succeeds(
94+ 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
95+ )
9496
95− $machine->waitUntilSucceeds('journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"');
97+ machine.wait_until_succeeds(
98+ 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
99+ )
96100 '';
97101 })));
98102