Fixes for test suite

Author: robtaylor

tests/fixtures/mock.toml

@@ -7,19 +7,3 @@ silicon = "chipflow_lib.steps.silicon:SiliconStep"
 [chipflow.silicon]
 process = "ihp_sg13g2"
 package = "pga144"
-
-[chipflow.clocks]
-default = 'sys_clk'
-
-[chipflow.resets]
-default = 'sys_rst_n'
-
-[chipflow.silicon.pads]
-sys_clk     = { type = "clk", loc = "N3" }
-sys_rst_n    = { type = "i",   loc = "N4" }
-
-[chipflow.silicon.power]
-vss         = { loc = "N1" }
-vssio       = { loc = "N5" }
-vddio       = { loc = "N6" }
-vdd         = { loc = "N7" }

tests/test_init.py

@@ -94,8 +94,6 @@ def test_parse_config_file_valid(self):
 [chipflow]
 project_name = "test_project"
 steps = { silicon = "chipflow_lib.steps.silicon:SiliconStep" }
-clocks = { default = "sys_clk" }
-resets = { default = "sys_rst_n" }
 
 [chipflow.silicon]
 process = "sky130"

tests/test_steps_silicon.py

@@ -22,11 +22,12 @@
 from chipflow_lib.cli import run as cli_run
 from chipflow_lib.steps.silicon import SiliconStep, SiliconTop
 from chipflow_lib.config_models import Config, ChipFlowConfig, SiliconConfig
+from chipflow_lib.platforms._internal import Process
 
 DEFAULT_PINLOCK = {
     "process" : "ihp_sg13g2",
     "package" : {
-        "type": {
+        "package_type": {
             "name": "pga144",
             "package_type": "QuadPackageDef",
             "width": 36,
@@ -56,7 +57,7 @@ def setUp(self):
             os.environ, {"CHIPFLOW_ROOT": self.temp_dir.name}
         )
         self.chipflow_root_patcher.start()
-        _ensure_chipflow_root.root = None
+        _ensure_chipflow_root.root = None  # type: ignore
 
         # Create basic config for tests
         self.config = {
@@ -97,9 +98,8 @@ def test_init(self, mock_silicontop_class):
             top={"mock_component": "module.MockComponent"},
             silicon=SiliconConfig(
                 package="cf20",
-                process="ihp_sg13g2",
+                process=Process.HELVELLYN2,
                 debug={"heartbeat": True},
-                pads={},
                 power={}
             )
         ))
@@ -133,7 +133,6 @@ def test_prepare(self, mock_top_components, mock_platform_class, mock_silicontop
                 package="cf20",
                 process="ihp_sg13g2",
                 debug={"heartbeat": True},
-                pads={},
                 power={}
             )
         ))
@@ -182,34 +181,6 @@ def test_build_cli_parser(self):
             default=False, action="store_true"
         )
 
-    @mock.patch("chipflow_lib.steps.silicon.SiliconPlatform")
-    @mock.patch("chipflow_lib.steps.silicon.top_components")
-    @mock.patch("chipflow_lib.steps.silicon.dotenv.load_dotenv")
-    @mock.patch("chipflow_lib.steps.silicon.SiliconStep.submit")
-    @mock.patch("chipflow_lib.steps.silicon.SiliconStep.prepare")
-    def test_cli_prepare(self, mock_prepare, mock_submit, mock_dotenv, mock_top_components, mock_platform_class):
-        """Test prepare method"""
-        mock_platform = mock_platform_class.return_value
-        mock_platform.build.return_value = "/path/to/rtlil"
-
-        # Create mock args
-        args = mock.MagicMock()
-        args.action = "prepare"
-
-        # Create SiliconStep instance - parse config first
-        config_obj = Config.model_validate(self.config)
-        step = SiliconStep(config_obj)
-
-        # Set up the mock to handle SiliconTop
-
-        # Call the method
-        step.run_cli(args)
-
-        mock_prepare.assert_called_once()
-        mock_submit.assert_not_called()
-        # Verify dotenv not loaded for prepare
-        mock_dotenv.assert_not_called()
-
     @unittest.skip
     @mock.patch("chipflow_lib.steps.silicon.SiliconTop")
     @mock.patch("chipflow_lib.steps.silicon.SiliconStep.prepare")