configure.ac

@@ -44,6 +44,9 @@ LIBS="$old_LIBS"
 
 PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
 
+testPath="$(dirname $(type -p expr))"
+AC_SUBST(testPath)
+
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
@@ -56,6 +59,7 @@ AC_CONFIG_FILES([
   src/root/Makefile
   src/script/Makefile
   tests/Makefile
+  tests/jobs/config.nix
 ])
 
 AC_CONFIG_FILES([src/script/hydra_build.pl], [chmod +x src/script/hydra_build.pl])

tests/Makefile.am

@@ -4,6 +4,7 @@ TESTS_ENVIRONMENT =					\
   HYDRA_DATA="$(abs_builddir)/data"				\
   HYDRA_HOME="$(top_srcdir)/src"			\
   NIX_REMOTE=						\
+  NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"		\
   NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"		\
   NIX_STORE_DIR="$(abs_builddir)/nix/store"			\
   NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix"		\
@@ -35,6 +36,8 @@ dirs :
 	mkdir -p data
 	touch data/hydra.conf
 	mkdir -p nix
+	mkdir -p nix/etc/nix
+	touch nix/etc/nix/nix.conf
 	mkdir -p nix/store
 	mkdir -p nix/var
 

tests/Setup.pm

@@ -2,9 +2,12 @@ package Setup;
 
 use strict;
 use Exporter;
+use Hydra::Helper::Nix;
+use Hydra::Helper::AddBuilds;
+use Cwd;
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(hydra_setup);
+our @EXPORT = qw(hydra_setup nrBuildsForJobset queuedBuildsForJobset nrQueuedBuildsForJobset createBaseJobset createJobsetWithOneInput evalSucceeds runBuild);
 
 sub hydra_setup {
   my ($db) = @_;
@@ -16,14 +19,20 @@ sub nrBuildsForJobset {
   return $jobset->builds->search({},{})->count ;
 }
 
+sub queuedBuildsForJobset {
+  my ($jobset) = @_;
+  return $jobset->builds->search({},{ join => 'schedulingInfo' });
+}
+
 sub nrQueuedBuildsForJobset {
   my ($jobset) = @_;
-  return $jobset->builds->search({},{ join => 'schedulingInfo' })->count ;
+  return queuedBuildsForJobset($jobset)->count ;
 }
 
 sub createBaseJobset {
   my ($jobsetName, $nixexprpath) = @_;
-  my $project = $db->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
+  
+  my $project = openHydraDB->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
   my $jobset = $project->jobsets->create({name => $jobsetName, nixexprinput => "jobs", nixexprpath => $nixexprpath, emailoverride => ""});
 
   my $jobsetinput;
@@ -55,4 +64,9 @@ sub evalSucceeds {
   return $res;
 }
 
+sub runBuild {
+  my ($build) = @_;
+  return captureStdoutStderr(60, ("../src/script/hydra_build.pl", $build->id));
+}
+
 1;

tests/evaluation-tests.pl.in

@@ -10,7 +10,7 @@ use Setup;
 
 my $db = openHydraDB;
 
-use Test::Simple tests => 16;
+use Test::Simple tests => 22;
 
 hydra_setup($db);
 
@@ -28,6 +28,12 @@ $jobset = createBaseJobset("basic", "basic.nix");
 ok(evalSucceeds($jobset),                  "Evaluating jobs/basic.nix should exit with return code 0");
 ok(nrQueuedBuildsForJobset($jobset) == 3 , "Evaluating jobs/basic.nix should result in 3 builds");
 
+for my $build (queuedBuildsForJobset($jobset)) {
+  ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix should exit with code 0");
+  my $newbuild = $db->resultset('Builds')->find($build->id);
+  my $expected = $build->job->name eq "fails" ? 1 : 0;
+  ok($newbuild->buildresultinfo->buildstatus == $expected, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus $expected");
+}
 
 # Test jobset with 2 jobs, one has parameter of succeeded build of the other
 $jobset = createJobsetWithOneInput("build-output-as-input", "build-output-as-input.nix", "build1", "build", "build1");

tests/jobs/basic.nix

@@ -1,22 +1,20 @@
+with import ./config.nix;
 {  
   empty_dir = 
-    derivation {
+    mkDerivation {
       name = "empty-dir";
-      system = builtins.currentSystem;
       builder = ./empty-dir-builder.sh;
     };
 
   fails = 
-    derivation {
+    mkDerivation {
       name = "fails";
-      system = builtins.currentSystem;
       builder = ./fail.sh;
     };
 
   succeed_with_failed = 
-    derivation {
+    mkDerivation {
       name = "succeed-with-failed";
-      system = builtins.currentSystem;
       builder = ./succeed-with-failed.sh;
     };
 }

tests/jobs/build-output-as-input.nix

@@ -0,0 +1,18 @@
+with import ./config.nix;
+let
+  jobs = {
+    build1 =
+      mkDerivation {
+        name = "build1";
+        builder = ./empty-dir-builder.sh;
+      };
+
+    build2 = 
+      {build1 ? jobs.build1 }:
+      mkDerivation {
+        name = "build2";
+        builder = ./empty-dir-builder.sh;
+        inherit build1;
+      };
+  };
+in jobs

tests/jobs/bzr-checkout-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-checkout-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/bzr-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/config.nix.in

@@ -0,0 +1,9 @@
+rec {
+  path = "@testPath@";
+
+  mkDerivation = args:
+    derivation ({
+      system = builtins.currentSystem;
+      PATH = path;
+    } // args);
+}

tests/jobs/empty-dir-builder.sh

@@ -1 +1,3 @@
+#! /bin/sh
+
 mkdir $out

tests/jobs/fail.sh

@@ -1 +1,2 @@
+#! /bin/sh
 exit 1

tests/jobs/git-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "git-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/hg-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "hg-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/scm-builder.sh

@@ -1,2 +1,3 @@
+#! /bin/sh
 mkdir $out
 cp -v $src/* $out/

tests/jobs/succeed-with-failed.sh

@@ -1,2 +1,3 @@
+#! /bin/sh
 mkdir -p $out/nix-support/failed
 

tests/jobs/svn-checkout-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-checkout-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/svn-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "svn-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }