Fix merge conflicts in test files

- Resolved merge conflicts in test_cli.py, test_init.py, test_pin_lock.py, and test_utils_additional.py
- Properly merged code from both branches while maintaining the test functionality
- Ensured all SiliconPlatformPort tests pass with the output port fix

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: robtaylor

tests/test_cli.py

@@ -15,11 +15,7 @@ class MockCommand:
     def build_cli_parser(self, parser):
         parser.add_argument("--option", help="Test option")
         parser.add_argument("action", choices=["valid", "error", "unexpected"])
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
     def run_cli(self, args):
         if args.action == "error":
             raise ChipFlowError("Command error")
@@ -43,32 +39,18 @@ def test_run_success(self, mock_get_cls, mock_pin_command, mock_parse_config):
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-        mock_pin_cmd = MockCommand()
-        mock_pin_command.return_value = mock_pin_cmd
-        
-        mock_test_cmd = MockCommand()
-        mock_get_cls.return_value = lambda config: mock_test_cmd
-        
-=======
 
         mock_pin_cmd = MockCommand()
         mock_pin_command.return_value = mock_pin_cmd
 
         mock_test_cmd = MockCommand()
         mock_get_cls.return_value = lambda config: mock_test_cmd
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         # Capture stdout for assertion
         with mock.patch("sys.stdout") as mock_stdout:
             # Run with valid action
             run(["test", "valid"])
-<<<<<<< HEAD
-            
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             # No error message should be printed
             mock_stdout.write.assert_not_called()
 
@@ -86,32 +68,18 @@ def test_run_command_error(self, mock_get_cls, mock_pin_command, mock_parse_conf
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-        mock_pin_cmd = MockCommand()
-        mock_pin_command.return_value = mock_pin_cmd
-        
-        mock_test_cmd = MockCommand()
-        mock_get_cls.return_value = lambda config: mock_test_cmd
-        
-=======
 
         mock_pin_cmd = MockCommand()
         mock_pin_command.return_value = mock_pin_cmd
 
         mock_test_cmd = MockCommand()
         mock_get_cls.return_value = lambda config: mock_test_cmd
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         # Capture stdout for assertion
         with mock.patch("builtins.print") as mock_print:
             # Run with error action
             run(["test", "error"])
-<<<<<<< HEAD
-            
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             # Error message should be printed
             mock_print.assert_called_once()
             self.assertIn("Error while executing `test error`", mock_print.call_args[0][0])
@@ -130,32 +98,18 @@ def test_run_unexpected_error(self, mock_get_cls, mock_pin_command, mock_parse_c
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-        mock_pin_cmd = MockCommand()
-        mock_pin_command.return_value = mock_pin_cmd
-        
-        mock_test_cmd = MockCommand()
-        mock_get_cls.return_value = lambda config: mock_test_cmd
-        
-=======
 
         mock_pin_cmd = MockCommand()
         mock_pin_command.return_value = mock_pin_cmd
 
         mock_test_cmd = MockCommand()
         mock_get_cls.return_value = lambda config: mock_test_cmd
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         # Capture stdout for assertion
         with mock.patch("builtins.print") as mock_print:
             # Run with unexpected error action
             run(["test", "unexpected"])
-<<<<<<< HEAD
-            
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             # Error message should be printed
             mock_print.assert_called_once()
             self.assertIn("Error while executing `test unexpected`", mock_print.call_args[0][0])
@@ -174,19 +128,6 @@ def test_step_init_error(self, mock_pin_command, mock_parse_config):
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-        mock_pin_cmd = MockCommand()
-        mock_pin_command.return_value = mock_pin_cmd
-        
-        # Make _get_cls_by_reference raise an exception during step initialization
-        with mock.patch("chipflow_lib.cli._get_cls_by_reference") as mock_get_cls:
-            mock_get_cls.return_value = mock.Mock(side_effect=Exception("Init error"))
-            
-            with self.assertRaises(ChipFlowError) as cm:
-                run(["test", "valid"])
-            
-=======
 
         mock_pin_cmd = MockCommand()
         mock_pin_command.return_value = mock_pin_cmd
@@ -198,7 +139,6 @@ def test_step_init_error(self, mock_pin_command, mock_parse_config):
             with self.assertRaises(ChipFlowError) as cm:
                 run(["test", "valid"])
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             self.assertIn("Encountered error while initializing step", str(cm.exception))
 
     @mock.patch("chipflow_lib.cli._parse_config")
@@ -215,25 +155,11 @@ def test_build_parser_error(self, mock_get_cls, mock_pin_command, mock_parse_con
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         # Make pin command raise an error during build_cli_parser
         mock_pin_cmd = mock.Mock()
         mock_pin_cmd.build_cli_parser.side_effect = Exception("Parser error")
         mock_pin_command.return_value = mock_pin_cmd
-<<<<<<< HEAD
-        
-        mock_test_cmd = mock.Mock()
-        mock_test_cmd.build_cli_parser.side_effect = Exception("Parser error")
-        mock_get_cls.return_value = lambda config: mock_test_cmd
-        
-        with self.assertRaises(ChipFlowError) as cm:
-            run(["pin", "lock"])
-        
-=======
 
         mock_test_cmd = mock.Mock()
         mock_test_cmd.build_cli_parser.side_effect = Exception("Parser error")
@@ -242,7 +168,6 @@ def test_build_parser_error(self, mock_get_cls, mock_pin_command, mock_parse_con
         with self.assertRaises(ChipFlowError) as cm:
             run(["pin", "lock"])
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertIn("Encountered error while building CLI argument parser", str(cm.exception))
 
     @mock.patch("chipflow_lib.cli._parse_config")
@@ -259,18 +184,6 @@ def test_verbosity_flags(self, mock_get_cls, mock_pin_command, mock_parse_config
             }
         }
         mock_parse_config.return_value = mock_config
-<<<<<<< HEAD
-        
-        mock_pin_cmd = MockCommand()
-        mock_pin_command.return_value = mock_pin_cmd
-        
-        mock_test_cmd = MockCommand()
-        mock_get_cls.return_value = lambda config: mock_test_cmd
-        
-        # Save original log level
-        original_level = logging.getLogger().level
-        
-=======
 
         mock_pin_cmd = MockCommand()
         mock_pin_command.return_value = mock_pin_cmd
@@ -281,23 +194,15 @@ def test_verbosity_flags(self, mock_get_cls, mock_pin_command, mock_parse_config
         # Save original log level
         original_level = logging.getLogger().level
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         try:
             # Test with -v
             with mock.patch("sys.stdout"):
                 run(["-v", "test", "valid"])
                 self.assertEqual(logging.getLogger().level, logging.INFO)
-<<<<<<< HEAD
-            
-            # Reset log level
-            logging.getLogger().setLevel(original_level)
-            
-=======
 
             # Reset log level
             logging.getLogger().setLevel(original_level)
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             # Test with -v -v
             with mock.patch("sys.stdout"):
                 run(["-v", "-v", "test", "valid"])

tests/test_init.py

@@ -4,10 +4,7 @@
 import unittest
 import tempfile
 from unittest import mock
-<<<<<<< HEAD
 from pathlib import Path
-=======
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
 
 import jsonschema
 import pytest
@@ -26,11 +23,7 @@ def setUp(self):
         # Save original environment to restore later
         self.original_chipflow_root = os.environ.get("CHIPFLOW_ROOT")
         self.original_sys_path = sys.path.copy()
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         # Create a temporary directory for tests
         self.temp_dir = tempfile.TemporaryDirectory()
         self.temp_path = self.temp_dir.name
@@ -41,11 +34,7 @@ def tearDown(self):
             os.environ["CHIPFLOW_ROOT"] = self.original_chipflow_root
         else:
             os.environ.pop("CHIPFLOW_ROOT", None)
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         sys.path = self.original_sys_path
         self.temp_dir.cleanup()
 
@@ -64,55 +53,34 @@ def test_get_cls_by_reference_module_not_found(self):
         """Test _get_cls_by_reference when the module doesn't exist"""
         with self.assertRaises(ChipFlowError) as cm:
             _get_cls_by_reference("nonexistent_module:SomeClass", "test context")
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertIn("Module `nonexistent_module` referenced by test context is not found", str(cm.exception))
 
     def test_get_cls_by_reference_class_not_found(self):
         """Test _get_cls_by_reference when the class doesn't exist in the module"""
         with self.assertRaises(ChipFlowError) as cm:
             _get_cls_by_reference("unittest:NonExistentClass", "test context")
-<<<<<<< HEAD
-        
-=======
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertIn("Module `unittest` referenced by test context does not define `NonExistentClass`", str(cm.exception))
 
     def test_ensure_chipflow_root_already_set(self):
         """Test _ensure_chipflow_root when CHIPFLOW_ROOT is already set"""
         os.environ["CHIPFLOW_ROOT"] = "/test/path"
         sys.path = ["/some/other/path"]
-<<<<<<< HEAD
-        
-        result = _ensure_chipflow_root()
-        
-=======
 
         result = _ensure_chipflow_root()
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertEqual(result, "/test/path")
         self.assertIn("/test/path", sys.path)
 
     def test_ensure_chipflow_root_not_set(self):
         """Test _ensure_chipflow_root when CHIPFLOW_ROOT is not set"""
         if "CHIPFLOW_ROOT" in os.environ:
             del os.environ["CHIPFLOW_ROOT"]
-<<<<<<< HEAD
-        
-        with mock.patch("os.getcwd", return_value="/mock/cwd"):
-            result = _ensure_chipflow_root()
-            
-=======
 
         with mock.patch("os.getcwd", return_value="/mock/cwd"):
             result = _ensure_chipflow_root()
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
             self.assertEqual(result, "/mock/cwd")
             self.assertEqual(os.environ["CHIPFLOW_ROOT"], "/mock/cwd")
             self.assertIn("/mock/cwd", sys.path)
@@ -134,15 +102,9 @@ def test_parse_config_file_valid(self):
         config_path = os.path.join(self.temp_path, "chipflow.toml")
         with open(config_path, "w") as f:
             f.write(config_content)
-<<<<<<< HEAD
-        
-        config = _parse_config_file(config_path)
-        
-=======
 
         config = _parse_config_file(config_path)
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertIn("chipflow", config)
         self.assertEqual(config["chipflow"]["project_name"], "test_project")
         self.assertEqual(config["chipflow"]["silicon"]["process"], "sky130")
@@ -158,17 +120,10 @@ def test_parse_config_file_invalid_schema(self):
         config_path = os.path.join(self.temp_path, "chipflow.toml")
         with open(config_path, "w") as f:
             f.write(config_content)
-<<<<<<< HEAD
-        
-        with self.assertRaises(ChipFlowError) as cm:
-            _parse_config_file(config_path)
-        
-=======
 
         with self.assertRaises(ChipFlowError) as cm:
             _parse_config_file(config_path)
 
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         self.assertIn("Syntax error in `chipflow.toml`", str(cm.exception))
 
     @mock.patch("chipflow_lib._ensure_chipflow_root")
@@ -177,17 +132,9 @@ def test_parse_config(self, mock_parse_config_file, mock_ensure_chipflow_root):
         """Test _parse_config which uses _ensure_chipflow_root and _parse_config_file"""
         mock_ensure_chipflow_root.return_value = "/mock/chipflow/root"
         mock_parse_config_file.return_value = {"chipflow": {"test": "value"}}
-<<<<<<< HEAD
-        
-        config = _parse_config()
-        
-        mock_ensure_chipflow_root.assert_called_once()
-        # We're expecting a string, not a Path
-=======
 
         config = _parse_config()
 
         mock_ensure_chipflow_root.assert_called_once()
->>>>>>> bd941c3 (Add comprehensive test suite for improved code coverage)
         mock_parse_config_file.assert_called_once_with("/mock/chipflow/root/chipflow.toml")
         self.assertEqual(config, {"chipflow": {"test": "value"}})