revert
This commit is contained in:
@@ -87,62 +87,7 @@ class ValidateWorkspaceTests(unittest.TestCase):
|
||||
with patch.object(validate_workspace.shutil, "which", return_value=None):
|
||||
env = validate_workspace.validation_environment({"PATH": "C:\\Windows\\System32"})
|
||||
|
||||
path_key = "Path" if os.name == "nt" else "PATH"
|
||||
self.assertTrue(env[path_key].startswith(str(common_bin)))
|
||||
|
||||
def test_common_cmake_install_path_updates_existing_windows_path_key(self):
|
||||
validate_workspace = load_validate_workspace()
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
common_bin = Path(tmp) / "CMake" / "bin"
|
||||
common_bin.mkdir(parents=True)
|
||||
(common_bin / "cmake.exe").write_text("", encoding="utf-8")
|
||||
with patch.object(validate_workspace, "COMMON_CMAKE_BIN", common_bin):
|
||||
with patch.object(validate_workspace.shutil, "which", return_value=None):
|
||||
env = validate_workspace.validation_environment({"Path": "C:\\Windows\\System32"})
|
||||
|
||||
self.assertIn("Path", env)
|
||||
self.assertNotIn("PATH", env)
|
||||
self.assertTrue(env["Path"].startswith(str(common_bin)))
|
||||
|
||||
def test_common_cmake_install_path_normalizes_uppercase_path_on_windows(self):
|
||||
if os.name != "nt":
|
||||
self.skipTest("Windows-specific subprocess environment behavior")
|
||||
validate_workspace = load_validate_workspace()
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
common_bin = Path(tmp) / "CMake" / "bin"
|
||||
common_bin.mkdir(parents=True)
|
||||
(common_bin / "cmake.exe").write_text("", encoding="utf-8")
|
||||
with patch.object(validate_workspace, "COMMON_CMAKE_BIN", common_bin):
|
||||
with patch.object(validate_workspace.shutil, "which", return_value=None):
|
||||
env = validate_workspace.validation_environment({"PATH": "C:\\Windows\\System32"})
|
||||
|
||||
self.assertIn("Path", env)
|
||||
self.assertNotIn("PATH", env)
|
||||
self.assertTrue(env["Path"].startswith(str(common_bin)))
|
||||
|
||||
def test_common_cmake_executable_is_used_when_command_tool_is_not_on_path(self):
|
||||
validate_workspace = load_validate_workspace()
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
common_bin = Path(tmp) / "CMake" / "bin"
|
||||
common_bin.mkdir(parents=True)
|
||||
(common_bin / "cmake.exe").write_text("", encoding="utf-8")
|
||||
with patch.object(validate_workspace, "COMMON_CMAKE_BIN", common_bin):
|
||||
with patch.object(validate_workspace.shutil, "which", return_value=None):
|
||||
command = validate_workspace.resolve_validation_command("cmake --version")
|
||||
|
||||
self.assertEqual(command, f'"{common_bin / "cmake.exe"}" --version')
|
||||
|
||||
def test_common_ctest_executable_is_used_when_command_tool_is_not_on_path(self):
|
||||
validate_workspace = load_validate_workspace()
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
common_bin = Path(tmp) / "CMake" / "bin"
|
||||
common_bin.mkdir(parents=True)
|
||||
(common_bin / "ctest.exe").write_text("", encoding="utf-8")
|
||||
with patch.object(validate_workspace, "COMMON_CMAKE_BIN", common_bin):
|
||||
with patch.object(validate_workspace.shutil, "which", return_value=None):
|
||||
command = validate_workspace.resolve_validation_command("ctest --version")
|
||||
|
||||
self.assertEqual(command, f'"{common_bin / "ctest.exe"}" --version')
|
||||
self.assertTrue(env["PATH"].startswith(str(common_bin)))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user