Fix rust-lang#135358

Author: tanvincible

src/bootstrap/bootstrap_test.py

@@ -256,27 +256,23 @@ class TestRustBuild(unittest.TestCase):
     @patch("os.path.exists")
     @patch("bootstrap.RustBuild.get_toml_static")
     def test_profile_none_with_non_git_source(self, mock_get_toml_static, mock_exists):
-        # Mock the behavior for a non-git source
         mock_exists.return_value = False
         mock_get_toml_static.return_value = None
 
         rust_root = "/mock/rust_root"
         config_toml = ""
 
-        # Simulate the execution of the logic
         profile = bootstrap.RustBuild.get_toml_static(config_toml, "profile")
 
         is_non_git_source = not os.path.exists(os.path.join(rust_root, ".git"))
         if profile is None and is_non_git_source:
             profile = "dist"
 
-        # Assert that profile is set to "dist"
         self.assertEqual(profile, "dist")
 
     @patch("os.path.exists")
     @patch("bootstrap.RustBuild.get_toml_static")
     def test_include_path_exists(self, mock_get_toml_static, mock_exists):
-        # Mock the behavior for a git source
         mock_exists.return_value = True
         mock_get_toml_static.return_value = "dist"
 
@@ -285,7 +281,6 @@ def test_include_path_exists(self, mock_get_toml_static, mock_exists):
 
         profile = bootstrap.RustBuild.get_toml_static(config_toml, "profile")
 
-        # Profile alias check
         profile_aliases = {"user": "dist"}
         include_file = f"config.{profile_aliases.get(profile) or profile}.toml"
         include_dir = os.path.join(rust_root, "src", "bootstrap", "defaults")
@@ -300,7 +295,6 @@ def test_include_path_exists(self, mock_get_toml_static, mock_exists):
     @patch("bootstrap.RustBuild.get_toml_static")
     @patch("builtins.open", new_callable=mock_open)
     def test_config_toml_inclusion(self, mock_open, mock_get_toml_static, mock_exists):
-        # Mock the behavior for a git source and profile dist
         mock_exists.side_effect = (
             lambda path: path
             == "/mock/rust_root/src/bootstrap/defaults/config.dist.toml"
@@ -313,7 +307,6 @@ def test_config_toml_inclusion(self, mock_open, mock_get_toml_static, mock_exist
 
         profile = bootstrap.RustBuild.get_toml_static(config_toml, "profile")
 
-        # Profile alias check
         profile_aliases = {"user": "dist"}
         include_file = f"config.{profile_aliases.get(profile) or profile}.toml"
         include_dir = os.path.join(rust_root, "src", "bootstrap", "defaults")
@@ -322,38 +315,32 @@ def test_config_toml_inclusion(self, mock_open, mock_get_toml_static, mock_exist
         with open(include_path) as included_toml:
             config_toml += os.linesep + included_toml.read()
 
-        # Assert that the content of included_toml is appended correctly
         self.assertIn("initial_config\nincluded_toml_content", config_toml)
 
     @patch("os.path.exists")
     @patch("bootstrap.RustBuild.get_toml_static")
     def test_invalid_profile_for_non_git_source(
         self, mock_get_toml_static, mock_exists
     ):
-        # Mock a non-git source
         mock_exists.return_value = False
 
-        # Mock config to simulate presence of options
         def mock_get_toml_static_side_effect(config_toml, option):
             if option in ["download-ci-llvm", "download-rustc"]:
-                return "true"  # Simulate the option being set in the config
+                return "true"
             return None
 
         mock_get_toml_static.side_effect = mock_get_toml_static_side_effect
 
         rust_root = "/mock/rust_root"
         config_toml = ""
 
-        # Simulate the execution of the logic
         profile = bootstrap.RustBuild.get_toml_static(config_toml, "profile")
         is_non_git_source = not os.path.exists(os.path.join(rust_root, ".git"))
         if profile is None and is_non_git_source:
             profile = "dist"
 
-        # Assert that non-git sources cannot use these options
         for option in ["download-ci-llvm", "download-rustc"]:
             if bootstrap.RustBuild.get_toml_static(config_toml, option):
-                # Now, raise the exception in the test code
                 with self.assertRaises(Exception) as context:
                     raise Exception(
                         f"Option '{option}' cannot be used with non-git sources."