1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00

allow extra test args

This commit is contained in:
Robin Appelman 2021-05-05 20:29:30 +02:00
commit 818092fda8
2 changed files with 16 additions and 16 deletions

View file

@ -144,7 +144,7 @@ async fn main() -> Result<()> {
None => eprintln!("{} is not running", cloud.id),
}
}
HazeArgs::Test { options, path } => {
HazeArgs::Test { options, mut args } => {
let cloud = Cloud::create(&mut docker, options, &config).await?;
println!("Waiting for servers to start");
cloud.wait_for_start(&mut docker).await?;
@ -164,7 +164,8 @@ async fn main() -> Result<()> {
cloud.destroy(&mut docker).await?;
return Err(e);
}
if let Some(app) = path
if let Some(app) = args
.first()
.as_ref()
.and_then(|path| path.strip_prefix("apps/"))
.map(|path| &path[0..path.find('/').unwrap_or(path.len())])
@ -175,13 +176,8 @@ async fn main() -> Result<()> {
println!("Enabling {}", app);
cloud.enable_app(&mut docker, app).await?;
}
cloud
.exec(
&mut docker,
vec!["tests".to_string(), path.unwrap_or_default()],
false,
)
.await?;
args.insert(0, "tests".to_string());
cloud.exec(&mut docker, args, false).await?;
cloud.destroy(&mut docker).await?;
}
};