fix: fix regression where top-level array jobs where shown in the output of qq jobs and qq stat

Author: Ladme

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Version 0.12.1
 
 - Fixed a bug where `qq clear` would report incorrect number of files excluded from clearing.
+- Fixed a regression where top-level array jobs were shown in the output of `qq jobs` and `qq stat`.
 
 ## Version 0.12.0
 

src/qq_lib/batch/interface/interface.py

@@ -329,6 +329,8 @@ def get_unfinished_batch_jobs(
 
         The jobs can be returned in arbitrary order.
 
+        Top level array jobs should not be included in the output.
+
         Args:
             user (str): Username for which to fetch uncompleted jobs.
             server (str | None): Optional name of the batch server to get jobs from.
@@ -348,6 +350,8 @@ def get_batch_jobs(cls, user: str, server: str | None = None) -> list[TBatchJob]
 
         The jobs can be returned in arbitrary order.
 
+        Top level array jobs should not be included in the output.
+
         Args:
             user (str): Username for which to fetch all jobs.
             server (str | None): Optional name of the batch server to get jobs from.
@@ -368,6 +372,8 @@ def get_all_unfinished_batch_jobs(
 
         The jobs can be returned in arbitrary order.
 
+        Top level array jobs should not be included in the output.
+
         Args:
             server (str | None): Optional name of the batch server to get jobs from.
 
@@ -385,6 +391,8 @@ def get_all_batch_jobs(cls, server: str | None = None) -> list[TBatchJob]:
 
         The jobs can be returned in arbitrary order.
 
+        Top level array jobs should not be included in the output.
+
         Args:
             server (str | None): Optional name of the batch server to get jobs from.
 

src/qq_lib/batch/pbs/pbs.py

@@ -208,7 +208,7 @@ def get_unfinished_batch_jobs(
         return cls._get_batch_jobs_using_command(
             command,
             include_completed=False,
-            include_top_level_array=True,
+            include_top_level_array=False,
             ignore_exit_code=False,
         )
 
@@ -221,7 +221,7 @@ def get_batch_jobs(cls, user: str, server: str | None = None) -> list[PBSJob]:
         return cls._get_batch_jobs_using_command(
             command,
             include_completed=True,
-            include_top_level_array=True,
+            include_top_level_array=False,
             ignore_exit_code=False,
         )
 
@@ -234,7 +234,7 @@ def get_all_unfinished_batch_jobs(cls, server: str | None = None) -> list[PBSJob
         return cls._get_batch_jobs_using_command(
             command,
             include_completed=False,
-            include_top_level_array=True,
+            include_top_level_array=False,
             ignore_exit_code=False,
         )
 
@@ -247,7 +247,7 @@ def get_all_batch_jobs(cls, server: str | None = None) -> list[PBSJob]:
         return cls._get_batch_jobs_using_command(
             command,
             include_completed=True,
-            include_top_level_array=True,
+            include_top_level_array=False,
             ignore_exit_code=False,
         )
 

tests/batch/pbs/test_pbs.py

@@ -2183,7 +2183,7 @@ def test_pbs_get_unfinished_batch_jobs_calls_correct_command(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwtu alice",
         include_completed=False,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2197,7 +2197,7 @@ def test_pbs_get_unfinished_batch_jobs_appends_server(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwtu alice @server",
         include_completed=False,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2230,7 +2230,7 @@ def test_pbs_get_batch_jobs_calls_correct_command(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwxtu alice",
         include_completed=True,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2244,7 +2244,7 @@ def test_pbs_get_batch_jobs_appends_server(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwxtu alice @server",
         include_completed=True,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2277,7 +2277,7 @@ def test_pbs_get_all_unfinished_batch_jobs_calls_correct_command(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwt",
         include_completed=False,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2291,7 +2291,7 @@ def test_pbs_get_all_unfinished_batch_jobs_appends_server(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fwt @server",
         include_completed=False,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2324,7 +2324,7 @@ def test_pbs_get_all_batch_jobs_calls_correct_command(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fxwt",
         include_completed=True,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )
 
@@ -2338,7 +2338,7 @@ def test_pbs_get_all_batch_jobs_appends_server(mock_jobs):
     mock_call.assert_called_once_with(
         "qstat -fxwt @myserver",
         include_completed=True,
-        include_top_level_array=True,
+        include_top_level_array=False,
         ignore_exit_code=False,
     )