Fix CLI tests

Author: robtaylor

chipflow_lib/platforms/_software.py

@@ -4,7 +4,6 @@
 import warnings
 
 from collections import defaultdict
-from typing import TYPE_CHECKING
 
 from amaranth import Fragment
 from amaranth.hdl import UnusedElaboratable

chipflow_lib/steps/silicon.py

@@ -2,7 +2,6 @@
 
 # SPDX-License-Identifier: BSD-2-Clause
 
-import argparse
 import inspect
 import json
 import logging
@@ -178,7 +177,7 @@ def submit(self, rtlil_path, args):
                     json.dump(data, f)
                 with open("config", 'w') as f:
                     f.write(config)
-                sp.info(f"Compiled design and configuration can be found in in `rtlil` and `config`")
+                sp.info("Compiled design and configuration can be found in in `rtlil` and `config`")
                 return
 
             def network_err(e):

tests/test_cli.py

@@ -2,6 +2,9 @@
 
 import pytest
 import unittest
+
+from contextlib import redirect_stdout
+from io import StringIO
 from unittest import mock
 
 from chipflow_lib import ChipFlowError
@@ -64,17 +67,15 @@ def test_run_command_error(self, mock_get_cls, mock_pin_command, mock_parse_conf
         mock_get_cls.return_value = lambda config: mock_test_cmd
 
         # Capture stdout for assertion
-        with mock.patch("builtins.print") as mock_print:
+        with redirect_stdout(StringIO()) as buffer:
             with pytest.raises(SystemExit) as systemexit:
                 # Run with error action
                 run(["test", "error"])
 
                 assert systemexit.type is SystemExit
                 assert systemexit.value.code == 1
 
-            # Error message should be printed
-            mock_print.assert_called_once()
-            self.assertIn("Error while executing `test error`", mock_print.call_args[0][0])
+        self.assertIn("Error while executing `test error`", buffer.getvalue())
 
     @mock.patch("chipflow_lib.cli._parse_config")
     @mock.patch("chipflow_lib.cli.PinCommand")
@@ -91,7 +92,7 @@ def test_run_unexpected_error(self, mock_get_cls, mock_pin_command, mock_parse_c
         mock_get_cls.return_value = lambda config: mock_test_cmd
 
         # Capture stdout for assertion
-        with mock.patch("builtins.print") as mock_print:
+        with redirect_stdout(StringIO()) as buffer:
             with pytest.raises(SystemExit) as systemexit:
                 # Run with unexpected error action
                 run(["test", "unexpected"])
@@ -100,9 +101,8 @@ def test_run_unexpected_error(self, mock_get_cls, mock_pin_command, mock_parse_c
                 assert systemexit.value.code == 1
 
             # Error message should be printed
-            mock_print.assert_called_once()
-            self.assertIn("Error while executing `test unexpected`", mock_print.call_args[0][0])
-            self.assertIn("Unexpected error", mock_print.call_args[0][0])
+            self.assertIn("Error while executing `test unexpected`", buffer.getvalue())
+            self.assertIn("Unexpected error", buffer.getvalue())
 
     @mock.patch("chipflow_lib.cli._parse_config")
     @mock.patch("chipflow_lib.cli.PinCommand")