From 06360bfbb69fdb02e8750c87d2d925b50ac7fb57 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 15 Dec 2021 12:03:06 -0500 Subject: [PATCH] RunCommandLogs.t: use test_context to get a specific build Fixes a build error: Can't use global @_ in 'my' at Schema/Result/RunCommandLogs.t line 20, near ', @_' --- t/Schema/Result/RunCommandLogs.t | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/t/Schema/Result/RunCommandLogs.t b/t/Schema/Result/RunCommandLogs.t index 69310ddd..f93f92b6 100644 --- a/t/Schema/Result/RunCommandLogs.t +++ b/t/Schema/Result/RunCommandLogs.t @@ -1,23 +1,16 @@ use strict; use warnings; use Setup; - -my %ctx = test_init(); - -require Hydra::Schema; -require Hydra::Model::DB; - use Test2::V0; -my $db = Hydra::Model::DB->new; -hydra_setup($db); +my $ctx = test_context(); +my $db = $ctx->db(); -my $project = $db->resultset('Projects')->create({name => "tests", displayname => "", owner => "root"}); -my $jobset = createBaseJobset("basic", "basic.nix", $ctx{jobsdir}); -ok(evalSucceeds($jobset), "Evaluating jobs/basic.nix should exit with return code 0"); -is(nrQueuedBuildsForJobset($jobset), 3, "Evaluating jobs/basic.nix should result in 3 builds"); +my $builds = $ctx->makeAndEvaluateJobset( + expression => "basic.nix", +); -my ($build, @_) = queuedBuildsForJobset($jobset); +my $build = $builds->{"empty_dir"}; sub new_run_log { return $db->resultset('RunCommandLogs')->create({ @@ -27,7 +20,6 @@ sub new_run_log { }); } - subtest "Not yet started" => sub { my $runlog = new_run_log();