Update unit tests, covering paging

Author: petrutlucian94

coriolisclient/cli/deployments.py

@@ -287,9 +287,11 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, args):
+        sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
         obj_list = self.app.client_manager.coriolis.deployments.list(
             marker=args.marker,
             limit=args.limit,
-            sort_keys=args.sort_keys,
-            sort_dirs=args.sort_dirs)
+            sort_keys=sort_keys,
+            sort_dirs=sort_dirs,
+        )
         return DeploymentFormatter().list_objects(obj_list)

coriolisclient/cli/transfer_executions.py

@@ -195,11 +195,11 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, args):
-        sort_keys, sort_dirs = cli_utils.parse_sort_args(args.sort)
+        sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
         obj_list = self.app.client_manager.coriolis.transfer_executions.list(
             args.transfer,
             marker=args.marker,
             limit=args.limit,
-            sort_keys=args.sort_keys,
-            sort_dirs=args.sort_dirs)
+            sort_keys=sort_keys,
+            sort_dirs=sort_dirs)
         return TransferExecutionFormatter().list_objects(obj_list)

coriolisclient/cli/transfers.py

@@ -334,11 +334,13 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, args):
+        sort_keys, sort_dirs = cli_utils.parse_sort_arg(args.sort)
         obj_list = self.app.client_manager.coriolis.transfers.list(
             marker=args.marker,
             limit=args.limit,
-            sort_keys=args.sort_keys,
-            sort_dirs=args.sort_dirs)
+            sort_keys=sort_keys,
+            sort_dirs=sort_dirs,
+        )
         return TransferFormatter().list_objects(obj_list)
 
 

coriolisclient/cli/utils.py

@@ -267,7 +267,7 @@ def _split_pool_mapping_arg(arg):
                  'be of the form "INSTANCE_IDENTIFIER=MINION_POOL_ID".')
 
 
-def parse_sort_arg(sort: str) -> tuple[list, list]:
+def parse_sort_arg(sort: str | None) -> tuple[list, list]:
     """Parse sort CLI argument.
 
     :param sort: Comma-separated list of sort keys and directions in the form
@@ -277,6 +277,9 @@ def parse_sort_arg(sort: str) -> tuple[list, list]:
     """
     sort_keys = []
     sort_dirs = []
+    if not sort:
+        return sort_keys, sort_dirs
+
     for sort_entry in sort.split(','):
         sort_key, _sep, sort_dir = sort_entry.partition(':')
         if not sort_dir:

coriolisclient/tests/cli/test_deployments.py

@@ -334,7 +334,7 @@ def test_take_action(self):
         mock_fun.return_value = [
             v1_deployments.Deployment(mock.MagicMock(), DEPLOYMENT_LIST_DATA)]
 
-        columns, data = self.cli.take_action(mock.ANY)
+        columns, data = self.cli.take_action(mock.MagicMock())
 
         self.assertEqual(deployments.DeploymentFormatter().columns, columns)
         self.assertEqual([DEPLOYMENT_LIST_FORMATTED_DATA], list(data))

coriolisclient/tests/cli/test_transfer_executions.py

@@ -426,6 +426,7 @@ def test_take_action(
         args = mock.Mock()
         args.transfer = mock.sentinel.transfer
         mock_transfer_list = mock.Mock()
+        args.sort = None
         self.mock_app.client_manager.coriolis.transfer_executions.list = \
             mock_transfer_list
 
@@ -435,6 +436,12 @@ def test_take_action(
             mock_list_objects.return_value,
             result
         )
-        mock_transfer_list.assert_called_once_with(mock.sentinel.transfer)
+        mock_transfer_list.assert_called_once_with(
+            mock.sentinel.transfer,
+            marker=args.marker,
+            limit=args.limit,
+            sort_keys=[],
+            sort_dirs=[],
+        )
         mock_list_objects.assert_called_once_with(
             mock_transfer_list.return_value)

coriolisclient/tests/cli/test_transfers.py

@@ -472,6 +472,7 @@ def test_get_parser(self, mock_get_parser):
     @mock.patch.object(transfers.TransferFormatter, 'list_objects')
     def test_take_action(self, mock_list_objects):
         args = mock.Mock()
+        args.sort = None
         mock_transfer = mock.Mock()
         self.mock_app.client_manager.coriolis.transfers.list = mock_transfer
 

coriolisclient/tests/cli/test_utils.py

@@ -323,3 +323,13 @@ def test_add_minion_pool_args_to_parser(self):
             [{'instance_id': 'mock_instance_id', 'pool_id': 'mock_pool_id'}],
             args.instance_osmorphing_minion_pool_mappings
         )
+
+    @ddt.data(
+        (None, ([], [])),
+        ("key0:asc,key1:desc,key2",
+            (["key0", "key1", "key2"], ["asc", "desc", "desc"]))
+    )
+    @ddt.unpack
+    def test_parse_sort_arg(self, sort_arg, exp_ret):
+        ret = utils.parse_sort_arg(sort_arg)
+        self.assertEqual(exp_ret, ret)

coriolisclient/tests/v1/test_deployments.py

@@ -75,7 +75,7 @@ def test_list(self):
             result = self.deployments.list(detail=True)
             self.assertEqual(mock_list.return_value, result)
             mock_list.assert_called_once_with(
-                '/deployments/detail', 'deployments')
+                '/deployments/detail', 'deployments', query=[])
 
     def test_get(self):
         deployment = mock.Mock(uuid=DEPLOYMENT_ID)

coriolisclient/tests/v1/test_transfer_executions.py

@@ -49,7 +49,8 @@ def test_list(self, mock_list):
             result
         )
         mock_list.assert_called_once_with(
-            '/transfers/%s/executions' % mock.sentinel.transfer, "executions")
+            '/transfers/%s/executions' % mock.sentinel.transfer, "executions",
+            query=[])
 
     @mock.patch.object(transfer_executions.TransferExecutionManager, "_get")
     def test_get(self, mock_get):