MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[tests] retrying launcher tests cowardly killed by macOS

Browse Source 
GitOrigin-RevId: 8bd3da8f5a3b79321d4ccffb8c2ab55c6c3373ee
This commit is contained in:
Roman Shevchenko
2024-09-11 10:59:06 +02:00
committed by intellij-monorepo-bot
parent 08244e6c15
commit 532770bca2
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
native/XPlatLauncher/tests/utils/mod.rs
View File

@@ -4,7 +4,7 @@ use std::{env, fs, thread, time};
use std::collections::HashMap;
use std::fmt::{Debug, Formatter};
use std::fs::{File, OpenOptions};
use std::io::{BufReader, Read, Write};
use std::io::{Write};
use std::path::{Path, PathBuf};
use std::process::{Command, ExitStatus, Stdio};
use std::sync::Once;
@@ -504,7 +504,7 @@ pub fn run_launcher(run_spec: &LauncherRunSpec) -> LauncherRunResult {
}
pub fn run_launcher_ext(test_env: &TestEnvironment, run_spec: &LauncherRunSpec) -> LauncherRunResult {
match run_launcher_impl(test_env, run_spec) {
match run_launcher_with_retries(test_env, run_spec) {
Ok(result) => {
if run_spec.assert_status {
assert!(result.exit_status.success(), "The exit status of the launcher is not successful: {:?}", result);
@@ -517,6 +517,38 @@ pub fn run_launcher_ext(test_env: &TestEnvironment, run_spec: &LauncherRunSpec)
}
}
#[cfg(target_family = "windows")]
fn run_launcher_with_retries(test_env: &TestEnvironment, run_spec: &LauncherRunSpec) -> Result<LauncherRunResult> {
run_launcher_impl(test_env, run_spec)
}
#[cfg(target_family = "unix")]
fn run_launcher_with_retries(test_env: &TestEnvironment, run_spec: &LauncherRunSpec) -> Result<LauncherRunResult> {
use std::os::unix::process::ExitStatusExt;
// on macOS, the test process is inexplicably killed sometimes
let mut retries = 3;
let mut run_result = run_launcher_impl(test_env, run_spec);
loop {
if let Ok(result) = &run_result {
if let Some(signal) = result.exit_status.signal() {
if signal == libc::SIGKILL {
debug!("test process killed; retrying...");
retries -= 1;
if retries == 0 {
panic!("The test process was killed 3 times in a row; giving up. Last result: {:?}", run_result);
}
thread::sleep(time::Duration::from_secs(1));
run_result = run_launcher_impl(test_env, run_spec);
continue;
}
}
}
break;
}
run_result
}
fn run_launcher_impl(test_env: &TestEnvironment, run_spec: &LauncherRunSpec) -> Result<LauncherRunResult> {
debug!("Starting '{}'\n with args {:?}\n in '{}'",
test_env.launcher_path.display(), run_spec.args, test_env.test_root_dir.path().display());
@@ -609,12 +641,8 @@ fn read_output_file(path: &Path) -> Result<String> {
}
fn read_launcher_run_result(path: &Path) -> Result<IntellijMainDumpedLaunchParameters> {
let file = File::open(path)?;
let mut reader = BufReader::new(file);
let mut text = String::new();
reader.read_to_string(&mut text)?;
let dump: IntellijMainDumpedLaunchParameters = serde_json::from_str(&text)?;
Ok(dump)
let text = fs::read_to_string(path)?;
Ok(serde_json::from_str(&text)?)
}
pub fn test_runtime_selection(result: LauncherRunResult, expected_rt: PathBuf) {