jobdb_check_other_job: extra $why parameter

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index c57eabd97e91229e09543d69bebf36383816219b..444e96e1d59528ebf5ef234c04676b969f560353 100644 (file)
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -150,14 +150,14 @@ sub jobdb_resource_shared_mark_ready { #method
 }
 
 sub jobdb_check_other_job { #method
-    my ($mo, $flight,$job, $oflight,$ojob);
+    my ($mo, $flight,$job, $oflight,$ojob, $why) = @_;
 
     if ("$oflight.$ojob" ne "$flight.$job") {
         my $jstmt= <<END;
             SELECT * FROM jobs WHERE flight=? AND job=?
 END
         my $jrow= $dbh_tests->selectrow_hashref($jstmt,{}, $oflight,$ojob);
-        $jrow or broken("job $oflight.$ojob not found (looking for $param)");
+        $jrow or broken("job $oflight.$ojob not found ($why)");
         my $jstatus= $jrow->{'status'};
 
         defined $jstatus or broken("job $oflight.$ojob no status?!");
@@ -169,12 +169,12 @@ END
             my $ourstatus= $jrow->{'status'};
             if ($ourstatus eq 'queued') {
                 logm("not running under sg-execute-*:".
-                     " $oflight.$ojob queued ok, for $param");
+                     " $oflight.$ojob queued ok, $why");
             } else {
-                die "job $oflight.$ojob (for $param) queued (we are $ourstatus)";
+                die "job $oflight.$ojob ($why) queued (we are $ourstatus)";
             }
         } else {
-            broken("job $oflight.$ojob (for $param) $jstatus", 'blocked');
+            broken("job $oflight.$ojob ($why) $jstatus", 'blocked');
         }
     }
 }

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 5c51befb90e10f0c4e338150aec6d2badac8a067..e3683691e0db99c539a59bd06cb55f8dd7f908ac 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -244,7 +244,7 @@ sub get_runvar_maybe ($$) {
     # may be run outside transaction, or with flights locked
     my ($oflight, $ojob) = otherflightjob($otherflightjob);
 
-    $mjobdb->jobdb_check_other_job($flight,$job, $oflight,$ojob);
+    $mjobdb->jobdb_check_other_job($flight,$job, $oflight,$ojob, "for $param");
 
     my $row= $dbh_tests->selectrow_arrayref(<<END,{}, $oflight,$ojob,$param);
         SELECT val FROM runvars WHERE flight=? AND job=? AND name=?