Add test for config.json content generated by SiliconStep.submit

Author: robtaylor

tests/test_steps_silicon.py

@@ -316,6 +316,131 @@ def test_submit_dry_run(self, mock_version, mock_check_output):
             # Verify no requests were made
             self.assertFalse(hasattr(step, "_request_made"))
 
+    @mock.patch("chipflow_lib.steps.silicon.subprocess.check_output")
+    @mock.patch("chipflow_lib.steps.silicon.importlib.metadata.version")
+    @mock.patch("json.dumps")
+    def test_config_json_content(self, mock_json_dumps, mock_version, mock_check_output):
+        """Test the content of the config.json generated by submit"""
+        # Setup mocks for git commands - need enough values for two calls to submit
+        mock_check_output.side_effect = [
+            "abcdef\n",  # git rev-parse for first submit
+            "",          # git status for first submit
+            "abcdef\n",  # git rev-parse for second submit
+            ""           # git status for second submit
+        ]
+
+        # Setup version mocks
+        mock_version.return_value = "1.0.0"
+
+        # Create a custom platform mock with specific ports
+        platform_mock = mock.MagicMock()
+        platform_mock._ports = {
+            "uart_tx": mock.MagicMock(
+                pins=["A1"],
+                direction=mock.MagicMock(value="o")
+            ),
+            "uart_rx": mock.MagicMock(
+                pins=["B1"],
+                direction=mock.MagicMock(value="i")
+            ),
+            "gpio": mock.MagicMock(
+                pins=["C1", "C2", "C3"],
+                direction=mock.MagicMock(value="io")
+            )
+        }
+
+        # Create SiliconStep with mocked platform
+        step = SiliconStep(self.config)
+        step.platform = platform_mock
+
+        # Mock the json.dumps to capture the config content
+        def capture_json_args(*args, **kwargs):
+            if len(args) > 0 and isinstance(args[0], dict) and "silicon" in args[0]:
+                # Store the captured config for later assertion
+                capture_json_args.captured_config = args[0]
+            return "mocked_json_string"
+
+        capture_json_args.captured_config = None
+        mock_json_dumps.side_effect = capture_json_args
+
+        # Call submit with dry run to avoid actual HTTP requests
+        with mock.patch("builtins.print"):
+            step.submit("/path/to/rtlil", dry_run=True)
+
+        # Verify the config content
+        config = capture_json_args.captured_config
+        self.assertIsNotNone(config, "Config should have been captured")
+
+        # Check dependency versions
+        self.assertIn("dependency_versions", config)
+        dep_versions = config["dependency_versions"]
+        self.assertEqual(dep_versions["chipflow-lib"], "1.0.0")
+        self.assertEqual(dep_versions["amaranth"], "1.0.0")
+
+        # Check silicon section
+        self.assertIn("silicon", config)
+        silicon = config["silicon"]
+
+        # Check process and package
+        self.assertEqual(silicon["process"], "ihp_sg13g2")
+        self.assertEqual(silicon["pad_ring"], "cf20")
+
+        # Check pads configuration
+        self.assertIn("pads", silicon)
+        pads = silicon["pads"]
+
+        # Check specific pads
+        self.assertIn("uart_tx", pads)
+        self.assertEqual(pads["uart_tx"]["loc"], "A1")
+        self.assertEqual(pads["uart_tx"]["type"], "o")
+
+        self.assertIn("uart_rx", pads)
+        self.assertEqual(pads["uart_rx"]["loc"], "B1")
+        self.assertEqual(pads["uart_rx"]["type"], "i")
+
+        # Check multi-bit ports are correctly expanded
+        self.assertIn("gpio0", pads)
+        self.assertEqual(pads["gpio0"]["loc"], "C1")
+        self.assertEqual(pads["gpio0"]["type"], "io")
+
+        self.assertIn("gpio1", pads)
+        self.assertEqual(pads["gpio1"]["loc"], "C2")
+
+        self.assertIn("gpio2", pads)
+        self.assertEqual(pads["gpio2"]["loc"], "C3")
+
+        # Check power section exists and matches config
+        self.assertIn("power", silicon)
+
+        # Add a power entry to the config to test power section in the generated config
+        self.config["chipflow"]["silicon"]["power"] = {
+            "vdd": {"type": "power", "loc": "N1"},
+            "gnd": {"type": "ground", "loc": "S2"}
+        }
+
+        # Recreate SiliconStep with updated config
+        step_with_power = SiliconStep(self.config)
+        step_with_power.platform = platform_mock
+
+        # Reset captured config and call submit again
+        capture_json_args.captured_config = None
+        with mock.patch("builtins.print"):
+            step_with_power.submit("/path/to/rtlil", dry_run=True)
+
+        # Get new config with power entries
+        config_with_power = capture_json_args.captured_config
+        self.assertIsNotNone(config_with_power, "Config with power should have been captured")
+
+        # Check power entries
+        power = config_with_power["silicon"]["power"]
+        self.assertIn("vdd", power)
+        self.assertEqual(power["vdd"]["type"], "power")
+        self.assertEqual(power["vdd"]["loc"], "N1")
+
+        self.assertIn("gnd", power)
+        self.assertEqual(power["gnd"]["type"], "ground")
+        self.assertEqual(power["gnd"]["loc"], "S2")
+
     @mock.patch("chipflow_lib.steps.silicon.SiliconPlatform")
     @mock.patch("chipflow_lib.steps.silicon.importlib.metadata.version")
     @mock.patch("chipflow_lib.steps.silicon.subprocess.check_output")