From c8df544046b4d730ccbb333e73f0b6827ef29e94 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 23 Feb 2021 14:16:03 -0500
Subject: [PATCH] evaluate-dependent-jobsets: clean up test to be more clear

---
 tests/evaluate-dependent-jobsets.t | 37 ++++++++++++++++++------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/tests/evaluate-dependent-jobsets.t b/tests/evaluate-dependent-jobsets.t
index 7180fbc8..279e1f33 100644
--- a/tests/evaluate-dependent-jobsets.t
+++ b/tests/evaluate-dependent-jobsets.t
@@ -15,22 +15,29 @@ hydra_setup($db);
 # Test jobset with 2 jobs, one has parameter of succeeded build of the other
 my $jobset = createJobsetWithOneInput("build-output-as-input", "build-output-as-input.nix", "build1", "build", "build1");
 
-ok(evalSucceeds($jobset),                  "Evaluating jobs/build-output-as-input.nix should exit with return code 0");
-is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluating jobs/build-output-as-input.nix for first time should result in 1 build in queue");
-for my $build (queuedBuildsForJobset($jobset)) {
-    ok(runBuild($build), "Build '".$build->job."' from jobs/build-output-as-input.nix should exit with code 0");
-    my $newbuild = $db->resultset('Builds')->find($build->id);
-    is($newbuild->finished, 1, "Build '".$build->job."' from jobs/build-output-as-input.nix should be finished.");
-    is($newbuild->buildstatus, 0, "Build '".$build->job."' from jobs/build-output-as-input.nix should have buildstatus 0.");
-}
+ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix should exit with return code 0");
+is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluation should result in 1 build in queue");
 
-ok(evalSucceeds($jobset),                  "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0");
-is(nrQueuedBuildsForJobset($jobset), 1 , "Evaluating jobs/build-output-as-input.nix for second time after building build1 should result in 1 build in queue");
-for my $build (queuedBuildsForJobset($jobset)) {
-    ok(runBuild($build), "Build '".$build->job."' from jobs/basic.nix should exit with code 0");
+subtest "For the 'build1' job" => sub {
+    my ($build) = queuedBuildsForJobset($jobset);
+    is($build->job, "build1", "Verify the only job we got is for 'build1'");
+
+    ok(runBuild($build), "Build should exit with code 0");
     my $newbuild = $db->resultset('Builds')->find($build->id);
-    is($newbuild->finished, 1, "Build '".$build->job."' from jobs/build-output-as-input.nix should be finished.");
-    is($newbuild->buildstatus, 0, "Build '".$build->job."' from jobs/build-output-as-input.nix should have buildstatus 0.");
-}
+    is($newbuild->finished, 1, "Build should be finished.");
+    is($newbuild->buildstatus, 0, "Build should have buildstatus 0.");
+};
+
+ok(evalSucceeds($jobset), "Evaluating jobs/build-output-as-input.nix for second time should exit with return code 0");
+is(nrQueuedBuildsForJobset($jobset), 1 , "The second evaluation should result in 1 new build in queue: build2");
+subtest "For the 'build2' job" => sub {
+    my ($build) = queuedBuildsForJobset($jobset);
+    is($build->job, "build2", "Verify the only job we got is for 'build2'");
+
+    ok(runBuild($build), "Build should exit with code 0");
+    my $newbuild = $db->resultset('Builds')->find($build->id);
+    is($newbuild->finished, 1, "Build should be finished.");
+    is($newbuild->buildstatus, 0, "Build should have buildstatus 0.");
+};
 
 done_testing;