Remove phase vocabulary from Lazaret interfaces
This commit is contained in:
parent
3f9b1b3543
commit
e7dd95aea6
1 changed files with 547 additions and 579 deletions
|
|
@ -42,7 +42,7 @@ use lazaret_linux::process::{
|
|||
use lazaret_runtime_supervisor::network::{DnsProbeTarget, NetworkProbeRequest, TcpProbeTarget};
|
||||
use lazaret_runtime_supervisor::sandbox::{
|
||||
NETWORK_NAMESPACE_PATH, RootProcess, RunscCommand, SandboxBuildRequest, SandboxBundle,
|
||||
build_sandbox_bundle, production_sandbox_layout,
|
||||
build_sandbox_bundle, default_sandbox_layout,
|
||||
};
|
||||
use lazaret_runtime_supervisor::supervision::{
|
||||
AttachedRunscSignal, RuntimeNetworkLaunch, RuntimeSupervisorLaunch,
|
||||
|
|
@ -90,7 +90,7 @@ fn main() -> ExitCode {
|
|||
if arguments.first().and_then(|argument| argument.to_str()) == Some(NETWORK_MATRIX) {
|
||||
return match run_network_matrix() {
|
||||
Ok(()) => {
|
||||
println!("PASS production network composition matrix");
|
||||
println!("PASS network composition matrix");
|
||||
ExitCode::SUCCESS
|
||||
}
|
||||
Err(MatrixError::Skip(reason)) => {
|
||||
|
|
@ -122,15 +122,15 @@ fn main() -> ExitCode {
|
|||
if arguments.first().and_then(|argument| argument.to_str()) == Some(SESSION_TERMINAL_MATRIX) {
|
||||
return match run_session_terminal_matrix() {
|
||||
Ok(()) => {
|
||||
println!("PASS production Session Terminal matrix");
|
||||
println!("PASS Session Terminal composition matrix");
|
||||
ExitCode::SUCCESS
|
||||
}
|
||||
Err(MatrixError::Skip(reason)) => {
|
||||
println!("SKIP production Session Terminal matrix: {reason}");
|
||||
println!("SKIP Session Terminal composition matrix: {reason}");
|
||||
ExitCode::from(SKIP)
|
||||
}
|
||||
Err(MatrixError::Failure(error)) => {
|
||||
eprintln!("production Session Terminal matrix failed: {error}");
|
||||
eprintln!("Session Terminal composition matrix failed: {error}");
|
||||
ExitCode::FAILURE
|
||||
}
|
||||
};
|
||||
|
|
@ -329,7 +329,7 @@ fn run_session_terminal_matrix() -> Result<(), MatrixError> {
|
|||
.arguments()
|
||||
.iter()
|
||||
.position(|argument| argument == "run")
|
||||
.ok_or_else(|| failure("production runsc command has no run action"))?;
|
||||
.ok_or_else(|| failure("runsc command has no run action"))?;
|
||||
let workspace = host_path(fixture.configuration.workspace().canonical_label());
|
||||
let count = workspace.join("session-count");
|
||||
let finish = workspace.join("session-finish");
|
||||
|
|
@ -1072,7 +1072,7 @@ impl Fixture {
|
|||
xdg_data_home: None,
|
||||
xdg_runtime_dir: runtime,
|
||||
environment,
|
||||
sandbox_layout: production_sandbox_layout().map_err(failure)?,
|
||||
sandbox_layout: default_sandbox_layout().map_err(failure)?,
|
||||
})
|
||||
.map_err(failure)?;
|
||||
let runtime_domain = host_path(configuration.runtime_domain_root().canonical_label());
|
||||
|
|
@ -1136,7 +1136,7 @@ impl Fixture {
|
|||
xdg_data_home: None,
|
||||
xdg_runtime_dir: runtime,
|
||||
environment: BTreeMap::new(),
|
||||
sandbox_layout: production_sandbox_layout().map_err(failure)?,
|
||||
sandbox_layout: default_sandbox_layout().map_err(failure)?,
|
||||
})
|
||||
.map_err(failure)?;
|
||||
let runtime_domain = host_path(configuration.runtime_domain_root().canonical_label());
|
||||
|
|
@ -1462,7 +1462,7 @@ fn network_configuration(
|
|||
xdg_data_home: None,
|
||||
xdg_runtime_dir: runtime.to_path_buf(),
|
||||
environment: BTreeMap::new(),
|
||||
sandbox_layout: production_sandbox_layout().map_err(failure)?,
|
||||
sandbox_layout: default_sandbox_layout().map_err(failure)?,
|
||||
})
|
||||
.map_err(failure)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue