Make fixes add test.

Author: lloyd-brown

sky/client/cli/command.py

@@ -1350,12 +1350,10 @@ def _handle_jobs_queue_request(
     show_all: bool,
     show_user: bool,
     max_num_jobs_to_show: Optional[int],
-    pool_status_request_id: Optional[server_common.RequestId[List[Dict[str,
-                                                                Any]]]] = None,
-    is_called_by_user: bool = False,
-    only_in_progress: bool = False,
     pool_status_request_id: Optional[server_common.RequestId[List[Dict[
         str, Any]]]] = None,
+    is_called_by_user: bool = False,
+    only_in_progress: bool = False,
 ) -> Tuple[Optional[int], str]:
     """Get the in-progress managed jobs.
 

sky/jobs/utils.py

@@ -1714,8 +1714,8 @@ def format_job_table(
     tasks: List[Dict[str, Any]],
     show_all: bool,
     show_user: bool,
-    pool_status: Optional[List[Dict[str, Any]]] = None,
     return_rows: Literal[False] = False,
+    pool_status: Optional[List[Dict[str, Any]]] = None,
     max_jobs: Optional[int] = None,
     job_status_counts: Optional[Dict[str, int]] = None,
 ) -> str:

tests/unit_tests/test_sky/test_cli_helpers.py

@@ -3,7 +3,7 @@
 This module contains tests for CLI helper functions in sky.client.cli.command.
 """
 import traceback
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 from unittest import mock
 
 import colorama
@@ -75,6 +75,7 @@ def test_handle_jobs_queue_request_success_tuple_response():
     mock_stream.assert_called_once_with(request_id)
     mock_format.assert_called_once_with(
         managed_jobs_list,
+        pool_status=None,
         show_all=False,
         show_user=False,
         max_jobs=10,
@@ -128,6 +129,89 @@ def test_handle_jobs_queue_request_success_list_response():
     mock_stream.assert_called_once_with(request_id)
     mock_format.assert_called_once_with(
         mock_job_records,
+        pool_status=None,
+        show_all=True,
+        show_user=True,
+        max_jobs=None,
+        status_counts=None,
+    )
+
+
+def test_handle_jobs_queue_request_success_list_response_with_pool_status():
+    """Test _handle_jobs_queue_request with list response (legacy API)."""
+    # Create mock managed job records as dicts
+    mock_jobs = [
+        {
+            'job_id': 1,
+            'job_name': 'test-job-1'
+        },
+        {
+            'job_id': 2,
+            'job_name': 'test-job-2'
+        },
+        {
+            'job_id': 3,
+            'job_name': 'test-job-3'
+        },
+    ]
+
+    # Mock job records using the model
+    mock_job_records = [responses.ManagedJobRecord(**job) for job in mock_jobs]
+
+    # Mock pool status records using the model
+    mock_pool_statuses = [
+        {
+            'replica_info': [
+                {
+                    'replica_id': 1,
+                    'used_by': 3,
+                },
+                {
+                    'replica_id': 2,
+                    'used_by': 2,
+                },
+                {
+                    'replica_id': 3,
+                    'used_by': 1,
+                },
+            ],
+        },
+    ]
+
+    request_id = server_common.RequestId[List[responses.ManagedJobRecord]](
+        'test-request-id')
+
+    pool_status_request_id = server_common.RequestId[List[Dict[str, Any]]](
+        'test-pool-status-request-id')
+
+    with mock.patch.object(client_sdk,
+                           'stream_and_get',
+                           side_effect=[mock_job_records,
+                                        mock_pool_statuses]) as mock_stream:
+        with mock.patch.object(usage_lib.messages.usage, 'set_internal'):
+            with mock.patch.object(
+                    table_utils, 'format_job_table',
+                    return_value='formatted table') as mock_format:
+                num_jobs, msg = command._handle_jobs_queue_request(
+                    request_id=request_id,
+                    show_all=True,
+                    show_user=True,
+                    max_num_jobs_to_show=None,
+                    pool_status_request_id=pool_status_request_id,
+                    is_called_by_user=True,
+                    only_in_progress=False,
+                )
+
+    # Verify the result - should count unique job IDs
+    assert num_jobs == 3
+    assert msg == 'formatted table'
+    mock_stream.assert_has_calls([
+        mock.call(request_id),
+        mock.call(pool_status_request_id),
+    ])
+    mock_format.assert_called_once_with(
+        mock_job_records,
+        pool_status=mock_pool_statuses,
         show_all=True,
         show_user=True,
         max_jobs=None,