Skip to content

Commit

Permalink
Change not_attempted to unknown, published to visible and unpublished…
Browse files Browse the repository at this point in the history 
… to shadowed
  • Loading branch information
@eigerx
eigerx committed Sep 10, 2024
1 parent 2cb5b3a commit 632abb8
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 54 deletions.
12 changes: 6 additions & 6 deletions python/lsst/ctrl/mpexec/cli/script/report.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ def print_summary(summary: Summary, full_output_filename: str | None, brief: boo
quanta_table.append(
{
"Task": label,
"Not Attempted": task_summary.n_not_attempted,
"Unknown": task_summary.n_unknown,
"Successful": task_summary.n_successful,
"Blocked": task_summary.n_blocked,
"Failed": task_summary.n_failed,
"Wonky": task_summary.n_wonky,
"TOTAL": sum(
[
task_summary.n_successful,
task_summary.n_not_attempted,
task_summary.n_unknown,
task_summary.n_blocked,
task_summary.n_failed,
task_summary.n_wonky,
Expand Down Expand Up @@ -259,15 +259,15 @@ def print_summary(summary: Summary, full_output_filename: str | None, brief: boo
dataset_table.append(
{
"Dataset": dataset_type_name,
"Published": dataset_type_summary.n_published,
"Unpublished": dataset_type_summary.n_unpublished,
"Visible": dataset_type_summary.n_visible,
"Shadowed": dataset_type_summary.n_shadowed,
"Predicted Only": dataset_type_summary.n_predicted_only,
"Unsuccessful": dataset_type_summary.n_unsuccessful,
"Cursed": dataset_type_summary.n_cursed,
"TOTAL": sum(
[
dataset_type_summary.n_published,
dataset_type_summary.n_unpublished,
dataset_type_summary.n_visible,
dataset_type_summary.n_shadowed,
dataset_type_summary.n_predicted_only,
dataset_type_summary.n_unsuccessful,
dataset_type_summary.n_cursed,
Expand Down
96 changes: 48 additions & 48 deletions tests/test_cliCmdReport.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_report(self):

# Check that task0 and the quanta for task0 exist in the string
self.assertIn("task0", result_v2_terminal_out.stdout)
self.assertIn("Not Attempted", result_v2_terminal_out.stdout)
self.assertIn("Unknown", result_v2_terminal_out.stdout)
self.assertIn("Successful", result_v2_terminal_out.stdout)
self.assertIn("Blocked", result_v2_terminal_out.stdout)
self.assertIn("Failed", result_v2_terminal_out.stdout)
Expand All @@ -158,7 +158,7 @@ def test_report(self):

# Check that task0 and the quanta for task0 exist in the string
self.assertIn("task0", result_v2_brief.stdout)
self.assertIn("Not Attempted", result_v2_brief.stdout)
self.assertIn("Unknown", result_v2_brief.stdout)
self.assertIn("Successful", result_v2_brief.stdout)
self.assertIn("Blocked", result_v2_brief.stdout)
self.assertIn("Failed", result_v2_brief.stdout)
Expand Down Expand Up @@ -189,7 +189,7 @@ def test_report(self):

# Check that task0 and the quanta for task0 exist in the string
self.assertIn("task0", result_v2_full.stdout)
self.assertIn("Not Attempted", result_v2_full.stdout)
self.assertIn("Unknown", result_v2_full.stdout)
self.assertIn("Successful", result_v2_full.stdout)
self.assertIn("Blocked", result_v2_full.stdout)
self.assertIn("Failed", result_v2_full.stdout)
Expand All @@ -207,7 +207,7 @@ def test_report(self):
"task0": TaskSummary(
n_successful=0,
n_blocked=0,
n_not_attempted=1,
n_unknown=1,
n_expected=1,
failed_quanta=[],
recovered_quanta=[],
Expand All @@ -218,7 +218,7 @@ def test_report(self):
"task1": TaskSummary(
n_successful=0,
n_blocked=0,
n_not_attempted=1,
n_unknown=1,
n_expected=1,
failed_quanta=[],
recovered_quanta=[],
Expand All @@ -229,7 +229,7 @@ def test_report(self):
"task2": TaskSummary(
n_successful=0,
n_blocked=0,
n_not_attempted=1,
n_unknown=1,
n_expected=1,
failed_quanta=[],
recovered_quanta=[],
Expand All @@ -240,7 +240,7 @@ def test_report(self):
"task3": TaskSummary(
n_successful=0,
n_blocked=0,
n_not_attempted=1,
n_unknown=1,
n_expected=1,
failed_quanta=[],
recovered_quanta=[],
Expand All @@ -251,7 +251,7 @@ def test_report(self):
"task4": TaskSummary(
n_successful=0,
n_blocked=0,
n_not_attempted=1,
n_unknown=1,
n_expected=1,
failed_quanta=[],
recovered_quanta=[],
Expand All @@ -266,8 +266,8 @@ def test_report(self):
{
"add_dataset1": DatasetTypeSummary(
producer="task0",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -277,8 +277,8 @@ def test_report(self):
),
"add2_dataset1": DatasetTypeSummary(
producer="task0",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -288,8 +288,8 @@ def test_report(self):
),
"task0_metadata": DatasetTypeSummary(
producer="task0",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -299,8 +299,8 @@ def test_report(self):
),
"task0_log": DatasetTypeSummary(
producer="task0",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -310,8 +310,8 @@ def test_report(self):
),
"add_dataset2": DatasetTypeSummary(
producer="task1",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -321,8 +321,8 @@ def test_report(self):
),
"add2_dataset2": DatasetTypeSummary(
producer="task1",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -332,8 +332,8 @@ def test_report(self):
),
"task1_metadata": DatasetTypeSummary(
producer="task1",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -343,8 +343,8 @@ def test_report(self):
),
"task1_log": DatasetTypeSummary(
producer="task1",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -354,8 +354,8 @@ def test_report(self):
),
"add_dataset3": DatasetTypeSummary(
producer="task2",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -365,8 +365,8 @@ def test_report(self):
),
"add2_dataset3": DatasetTypeSummary(
producer="task2",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -376,8 +376,8 @@ def test_report(self):
),
"task2_metadata": DatasetTypeSummary(
producer="task2",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -387,8 +387,8 @@ def test_report(self):
),
"task2_log": DatasetTypeSummary(
producer="task2",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -398,8 +398,8 @@ def test_report(self):
),
"add_dataset4": DatasetTypeSummary(
producer="task3",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -409,8 +409,8 @@ def test_report(self):
),
"add2_dataset4": DatasetTypeSummary(
producer="task3",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -420,8 +420,8 @@ def test_report(self):
),
"task3_metadata": DatasetTypeSummary(
producer="task3",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -431,8 +431,8 @@ def test_report(self):
),
"task3_log": DatasetTypeSummary(
producer="task3",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -442,8 +442,8 @@ def test_report(self):
),
"add_dataset5": DatasetTypeSummary(
producer="task4",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -453,8 +453,8 @@ def test_report(self):
),
"add2_dataset5": DatasetTypeSummary(
producer="task4",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -464,8 +464,8 @@ def test_report(self):
),
"task4_metadata": DatasetTypeSummary(
producer="task4",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand All @@ -475,8 +475,8 @@ def test_report(self):
),
"task4_log": DatasetTypeSummary(
producer="task4",
n_published=0,
n_unpublished=0,
n_visible=0,
n_shadowed=0,
n_predicted_only=0,
n_expected=1,
cursed_datasets=[],
Expand Down

0 comments on commit 632abb8

Please sign in to comment.