This commit is contained in:
Eelco Dolstra 2015-06-12 18:02:54 +02:00
parent f06ec78859
commit abca7a87da

View file

@ -174,7 +174,7 @@ in rec {
tests.install = genAttrs' (system: tests.install = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
simpleTest { simpleTest {
machine = hydraServer (builtins.getAttr system build); # build.${system} machine = hydraServer build.${system};
testScript = testScript =
'' ''
$machine->waitForJob("hydra-init"); $machine->waitForJob("hydra-init");
@ -189,7 +189,7 @@ in rec {
tests.api = genAttrs' (system: tests.api = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
simpleTest { simpleTest {
machine = hydraServer (builtins.getAttr system build); # build.${system} machine = hydraServer build.${system};
testScript = testScript =
let dbi = "dbi:Pg:dbname=hydra;user=root;"; in let dbi = "dbi:Pg:dbname=hydra;user=root;"; in
'' ''
@ -218,7 +218,7 @@ in rec {
/* /*
tests.s3backup = genAttrs' (system: tests.s3backup = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
let hydra = builtins.getAttr system build; in # build."${system}" let hydra = build.${system}
simpleTest { simpleTest {
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }: