fix merge conflicts: update cli orders download test to no longer expect a message

Author: jreiberkyle

planet/cli/orders.py

@@ -117,12 +117,11 @@ async def download(ctx, order_id, quiet, overwrite, dest):
         with planet.reporting.StateBar(order_id=order_id,
                                        disable=quiet) as bar:
             await cl.poll(str(order_id), report=bar.update)
-            filenames = await cl.download_order(
+            _ = await cl.download_order(
                     str(order_id),
                     directory=dest,
                     overwrite=overwrite,
                     progress_bar=not quiet)
-    click.echo(f'Downloaded {len(filenames)} files.')
 
 
 def split_id_list(ctx, param, value):

tests/integration/test_orders_cli.py

@@ -237,10 +237,8 @@ def test_cli_orders_download(invoke, mock_download_response, oid):
         result = invoke(['download', oid], runner=runner)
         assert not result.exception
 
-        # output is progress reporting plus the message
-        message = 'Downloaded 2 files.\n'
-        assert message in result.output
-        assert message != result.output
+        # no message, output is only progress reporting
+        assert result.output.startswith('\r00:00 - order')
 
         # Check that the files were downloaded and have the correct contents
         f1_path = Path(folder) / 'm1.json'