Hide transient command windows
This commit is contained in:
@@ -487,6 +487,7 @@ def _find_listening_pids(port: int) -> set[int]:
|
|||||||
text=True,
|
text=True,
|
||||||
errors="replace",
|
errors="replace",
|
||||||
shell=False,
|
shell=False,
|
||||||
|
creationflags=_hidden_process_creation_flags(),
|
||||||
)
|
)
|
||||||
if result.returncode != 0:
|
if result.returncode != 0:
|
||||||
message = result.stderr.strip() or f"netstat 退出码 {result.returncode}"
|
message = result.stderr.strip() or f"netstat 退出码 {result.returncode}"
|
||||||
@@ -502,6 +503,7 @@ def _terminate_process_tree(pid: int) -> None:
|
|||||||
text=True,
|
text=True,
|
||||||
errors="replace",
|
errors="replace",
|
||||||
shell=False,
|
shell=False,
|
||||||
|
creationflags=_hidden_process_creation_flags(),
|
||||||
)
|
)
|
||||||
if result.returncode != 0:
|
if result.returncode != 0:
|
||||||
message = result.stdout.strip() or f"taskkill 退出码 {result.returncode}"
|
message = result.stdout.strip() or f"taskkill 退出码 {result.returncode}"
|
||||||
@@ -744,6 +746,12 @@ def _background_creation_flags() -> int:
|
|||||||
return subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP
|
return subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP
|
||||||
|
|
||||||
|
|
||||||
|
def _hidden_process_creation_flags() -> int:
|
||||||
|
if os.name != "nt":
|
||||||
|
return 0
|
||||||
|
return getattr(subprocess, "CREATE_NO_WINDOW", 0)
|
||||||
|
|
||||||
|
|
||||||
def _backend_console_creation_flags() -> int:
|
def _backend_console_creation_flags() -> int:
|
||||||
if os.name != "nt":
|
if os.name != "nt":
|
||||||
return 0
|
return 0
|
||||||
@@ -904,6 +912,7 @@ def _run_process(
|
|||||||
stderr=subprocess.STDOUT,
|
stderr=subprocess.STDOUT,
|
||||||
env=process_environment,
|
env=process_environment,
|
||||||
shell=False,
|
shell=False,
|
||||||
|
creationflags=_hidden_process_creation_flags(),
|
||||||
)
|
)
|
||||||
assert process.stdout is not None
|
assert process.stdout is not None
|
||||||
for raw_line in process.stdout:
|
for raw_line in process.stdout:
|
||||||
|
|||||||
@@ -214,7 +214,17 @@ def _run_command(
|
|||||||
executable = Path(command[0])
|
executable = Path(command[0])
|
||||||
if executable.name.lower() in {"catalina.bat", "catalina.sh"} and executable.exists():
|
if executable.name.lower() in {"catalina.bat", "catalina.sh"} and executable.exists():
|
||||||
environment["CATALINA_HOME"] = str(executable.parent.parent)
|
environment["CATALINA_HOME"] = str(executable.parent.parent)
|
||||||
return subprocess.run(command, capture_output=True, text=True, timeout=6, shell=False, env=environment)
|
creation_flags = getattr(subprocess, "CREATE_NO_WINDOW", 0) if os.name == "nt" else 0
|
||||||
|
return subprocess.run(
|
||||||
|
command,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
errors="replace",
|
||||||
|
timeout=6,
|
||||||
|
shell=False,
|
||||||
|
env=environment,
|
||||||
|
creationflags=creation_flags,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _combine_output(completed: subprocess.CompletedProcess[str]) -> str:
|
def _combine_output(completed: subprocess.CompletedProcess[str]) -> str:
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ class DeployerTests(unittest.TestCase):
|
|||||||
self.assertEqual(output, ["npm ERR! ⚠ dependency failed", "安装失败"])
|
self.assertEqual(output, ["npm ERR! ⚠ dependency failed", "安装失败"])
|
||||||
self.assertNotIn("text", popen_options)
|
self.assertNotIn("text", popen_options)
|
||||||
self.assertEqual(popen_options["env"]["JAVA_HOME"], str(Path.cwd() / "fake-jdk"))
|
self.assertEqual(popen_options["env"]["JAVA_HOME"], str(Path.cwd() / "fake-jdk"))
|
||||||
|
expected_flags = getattr(subprocess, "CREATE_NO_WINDOW", 0) if os.name == "nt" else 0
|
||||||
|
self.assertEqual(popen_options["creationflags"], expected_flags)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
Path(popen_options["env"]["PATH"].split(os.pathsep)[0]),
|
Path(popen_options["env"]["PATH"].split(os.pathsep)[0]),
|
||||||
npm.parent,
|
npm.parent,
|
||||||
|
|||||||
@@ -100,6 +100,8 @@ class EnvironmentTests(unittest.TestCase):
|
|||||||
self.assertTrue(results[0].installed)
|
self.assertTrue(results[0].installed)
|
||||||
self.assertEqual(run.call_args.kwargs["env"]["JAVA_HOME"], str(java.parent.parent))
|
self.assertEqual(run.call_args.kwargs["env"]["JAVA_HOME"], str(java.parent.parent))
|
||||||
self.assertTrue(run.call_args.kwargs["env"]["PATH"].startswith(str(java.parent)))
|
self.assertTrue(run.call_args.kwargs["env"]["PATH"].startswith(str(java.parent)))
|
||||||
|
expected_flags = getattr(subprocess, "CREATE_NO_WINDOW", 0) if environment_module.os.name == "nt" else 0
|
||||||
|
self.assertEqual(run.call_args.kwargs["creationflags"], expected_flags)
|
||||||
|
|
||||||
def test_manual_maven_failure_is_not_hidden_by_path_failure(self):
|
def test_manual_maven_failure_is_not_hidden_by_path_failure(self):
|
||||||
with tempfile.TemporaryDirectory() as tmp:
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
|||||||
Reference in New Issue
Block a user