[OSSTEST,36/82] resource reporting, nfc: Break out report_rogue_task_description

Commit Message

Ian Jackson Oct. 7, 2020, 5:59 p.m. UTC

From: Ian Jackson <[e-mail]>

Signed-off-by: Ian Jackson <[e-mail]>
---
 Osstest/Executive.pm | 14 ++++++++++++++
 ms-planner           |  6 +-----
 2 files changed, 15 insertions(+), 5 deletions(-)

Patch

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 5f59c44e..e3ab1dc3 100644
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -51,6 +51,7 @@  BEGIN {
                       report_run_getinfo report_altcolour
                       report_altchangecolour opendb_tests
                       report_blessingscond report_find_push_age_info
+		      report_rogue_task_description
 		      log_stderr_timestamped
                       tcpconnect_queuedaemon plan_search
                       manual_allocation_base_jobinfo
@@ -418,6 +419,19 @@  sub report_blessingscond ($) {
     return $blessingscond;
 }
 
+sub report_rogue_task_description ($) {
+    my ($arow) = @_;
+    # should have the fields from tasks, except taskid which
+    #  caller must print if they want it.
+    # may also have fields from resources (eg subtask)
+    my $info= "rogue task ";
+    $info .= " $arow->{type} $arow->{refkey}";
+    $info .= " ($arow->{comment})" if defined $arow->{comment};
+    $info .= " $arow->{subtask}";
+    $info .= " (user $arow->{username})";
+    return $info;
+}
+
 sub report__find_test ($$$$$$$) {
     my ($blessings, $branches, $tree,
 	$revision, $selection, $extracond, $sortlimit) = @_;
diff --git a/ms-planner b/ms-planner
index 41f27fa0..4b970730 100755
--- a/ms-planner
+++ b/ms-planner
@@ -321,11 +321,7 @@  END
 	    $info= "(preparing)";
 	} else {
 	    print DEBUG "rogue $reso $shareix: $arow->{owntaskid}\n";
-	    $info= "rogue task";
-	    $info .= " $arow->{type} $arow->{refkey}";
-	    $info .= " ($arow->{comment})" if defined $arow->{comment};
-	    $info .= " $arow->{subtask}";
-	    $info .= " (user $arow->{username})";
+	    $info= report_rogue_task_description($arow);
 	}
 	$plan->{Allocations}{$reskey}= {
             Task => $arow->{owntaskid},