From 0810f5debcaa4372f78b225453b578ec09db097b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 15 Dec 2021 12:36:19 -0500
Subject: [PATCH] finish making the dynamic hooks only run on project & jobset
 agreement

---
 src/lib/Hydra/Plugin/RunCommand.pm | 10 ++++++++--
 t/Hydra/Plugin/RunCommand/fanout.t |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/lib/Hydra/Plugin/RunCommand.pm b/src/lib/Hydra/Plugin/RunCommand.pm
index 79bf72a8..6d099142 100644
--- a/src/lib/Hydra/Plugin/RunCommand.pm
+++ b/src/lib/Hydra/Plugin/RunCommand.pm
@@ -71,9 +71,15 @@ sub isBuildEligibleForDynamicRunCommand {
             return 0;
         }
 
-        if ($build->jobset->enable_dynamic_run_command) {
-            return 1;
+        if (! $build->jobset->enable_dynamic_run_command) {
+            return 0;
         }
+
+        if (! $build->project->enable_dynamic_run_command) {
+            return 0;
+        }
+
+        return 1;
     }
 
     return 0;
diff --git a/t/Hydra/Plugin/RunCommand/fanout.t b/t/Hydra/Plugin/RunCommand/fanout.t
index 90bf4a6f..bd2502ec 100644
--- a/t/Hydra/Plugin/RunCommand/fanout.t
+++ b/t/Hydra/Plugin/RunCommand/fanout.t
@@ -173,7 +173,7 @@ subtest "isBuildEligibleForDynamicRunCommand" => sub {
     };
 
     subtest "With dynamic runcommand disabled ..." => sub {
-        subtest "disabled on the project, enabled on the jobset" => {
+        subtest "disabled on the project, enabled on the jobset" => sub {
             $build->project->update({enable_dynamic_run_command => 0});
             $build->jobset->update({enable_dynamic_run_command => 1});
 
@@ -184,7 +184,7 @@ subtest "isBuildEligibleForDynamicRunCommand" => sub {
             );
         };
 
-        subtest "enabled on the project, disabled on the jobset" => {
+        subtest "enabled on the project, disabled on the jobset" => sub {
             $build->project->update({enable_dynamic_run_command => 1});
             $build->jobset->update({enable_dynamic_run_command => 0});
 
@@ -195,7 +195,7 @@ subtest "isBuildEligibleForDynamicRunCommand" => sub {
             );
         };
 
-        subtest "disabled on the project, disabled on the jobset" => {
+        subtest "disabled on the project, disabled on the jobset" => sub {
             $build->project->update({enable_dynamic_run_command => 0});
             $build->jobset->update({enable_dynamic_run_command => 0});