From ceb6ea252ae791a5db21218c80d33a572956277b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 11 Jan 2022 11:47:42 -0500
Subject: [PATCH 1/3] CatalystUtils.pm: don't use Hydra::Helper::Nix

Using it causes database information to get fixated early, before tests can set a
new database. We only used it in one case, and that is an absolute reference anyway. The
tests for channel generation are passing, and that uses
[requireLocalStore, so this should be fine.
---
 src/lib/Hydra/Helper/CatalystUtils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm
index 925ed718..4b998271 100644
--- a/src/lib/Hydra/Helper/CatalystUtils.pm
+++ b/src/lib/Hydra/Helper/CatalystUtils.pm
@@ -6,7 +6,6 @@ use warnings;
 use Exporter;
 use ReadonlyX;
 use Nix::Store;
-use Hydra::Helper::Nix;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(
@@ -414,6 +413,7 @@ sub approxTableSize {
 
 sub requireLocalStore {
     my ($c) = @_;
+    require Hydra::Helper::Nix;
     notFound($c, "Nix channels are not supported by this Hydra server.") if !Hydra::Helper::Nix::isLocalStore();
 }
 

From 2b163aa78baa7368c28ec63fed54cb7e4d95d48b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 11 Jan 2022 11:48:02 -0500
Subject: [PATCH 2/3] CatalystUtils::showJobName: write a basic test that shows
 it works

---
 t/Hydra/Helper/CatalystUtils.t | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/t/Hydra/Helper/CatalystUtils.t b/t/Hydra/Helper/CatalystUtils.t
index 26f8dcde..bcb786ea 100644
--- a/t/Hydra/Helper/CatalystUtils.t
+++ b/t/Hydra/Helper/CatalystUtils.t
@@ -4,6 +4,13 @@ use Setup;
 use Test2::V0;
 use Hydra::Helper::CatalystUtils;
 
+my $ctx = test_context();
+
+my $builds = $ctx->makeAndEvaluateJobset(
+    expression => "basic.nix",
+    build => 1
+);
+
 subtest "trim" => sub {
     my %values = (
         "" => "",
@@ -25,4 +32,8 @@ subtest "trim" => sub {
     is(trim($uninitialized), '', "Trimming an uninitialized value");
 };
 
+subtest "showJobName" => sub {
+    ok(showJobName($builds->{"empty_dir"}), "showJobName succeeds");
+};
+
 done_testing;

From f30ca3c42384661d6e4794f59adb5cd0ebf0d2d5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 9 Jan 2022 10:13:29 -0500
Subject: [PATCH 3/3] showJobName: use jobset/project columns

---
 src/lib/Hydra/Helper/CatalystUtils.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm
index 4b998271..cf4138af 100644
--- a/src/lib/Hydra/Helper/CatalystUtils.pm
+++ b/src/lib/Hydra/Helper/CatalystUtils.pm
@@ -337,7 +337,8 @@ sub parseJobsetName {
 
 sub showJobName {
     my ($build) = @_;
-    return $build->get_column('project') . ":" . $build->get_column('jobset') . ":" . $build->get_column('job');
+    my $jobset = $build->jobset;
+    return $jobset->get_column('project') . ":" . $jobset->get_column('name') . ":" . $build->get_column('job');
 }