vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix "make check"

Browse source
This commit is contained in:
Eelco Dolstra 2012-03-12 21:13:50 +01:00
parent 13f4636436
commit 93efae0c23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Setup.pm
View file

@ -21,7 +21,7 @@ sub nrBuildsForJobset {
sub queuedBuildsForJobset { sub queuedBuildsForJobset {
my ($jobset) = @_; my ($jobset) = @_;
return $jobset->builds->search({},{ join => 'schedulingInfo' }); return $jobset->builds->search({finished => 0});
} }
sub nrQueuedBuildsForJobset { sub nrQueuedBuildsForJobset {

6
tests/evaluation-tests.pl
View file

@ -30,7 +30,7 @@ for my $build (queuedBuildsForJobset($jobset)) {
ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix should exit with code 0"); 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 $newbuild = $db->resultset('Builds')->find($build->id);
my $expected = $build->job->name eq "fails" ? 1 : 0; 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"); ok($newbuild->finished == 1 && $newbuild->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 # Test jobset with 2 jobs, one has parameter of succeeded build of the other
@ -41,7 +41,7 @@ ok(nrQueuedBuildsForJobset($jobset) == 1 , "Evaluating jobs/build-output-as-inpu
for my $build (queuedBuildsForJobset($jobset)) { for my $build (queuedBuildsForJobset($jobset)) {
ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix should exit with code 0"); 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 $newbuild = $db->resultset('Builds')->find($build->id);
ok($newbuild->buildresultinfo->buildstatus == 0, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus 0"); ok($newbuild->finished == 1 && $newbuild->buildstatus == 0, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus 0");
} }
ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0"); ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0");
@ -49,7 +49,7 @@ ok(nrQueuedBuildsForJobset($jobset) == 1 , "Evaluating jobs/build-output-as-inpu
for my $build (queuedBuildsForJobset($jobset)) { for my $build (queuedBuildsForJobset($jobset)) {
ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix should exit with code 0"); 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 $newbuild = $db->resultset('Builds')->find($build->id);
ok($newbuild->buildresultinfo->buildstatus == 0, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus 0"); ok($newbuild->finished == 1 && $newbuild->buildstatus == 0, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus 0");
} }

2
tests/query-all-tables.pl
View file

@ -7,7 +7,7 @@ my $db = openHydraDB;
my @sources = $db->sources; my @sources = $db->sources;
my $nrtables = scalar(@sources); my $nrtables = scalar(@sources);
use Test::Simple tests => 44; use Test::Simple tests => 42;
foreach my $source (@sources) { foreach my $source (@sources) {
my $title = "Basic select query for $source"; my $title = "Basic select query for $source";