Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -664,8 +664,7 @@ fn run_local_compose(local_dir: &str, args: &[&str]) -> DeployResult<()> {
/// running.
fn print_dnsmasq_hint() {
let running = cmd::run("brew", &["services", "list"])
.map(|out| out.contains("dnsmasq") && out.contains("started"))
.unwrap_or(false);
.is_ok_and(|out| out.contains("dnsmasq") && out.contains("started"));

if running {
return;
Expand Down
10 changes: 7 additions & 3 deletions tests/compose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ fn port_mapping_round_trip() {
assert!(v.contains(&"4222:4222".to_string()));
assert!(v.contains(&"8222:8222".to_string()));
}
_ => panic!("expected short ports format"),
docker_compose_types::Ports::Long(_) => panic!("expected short ports format"),
}
}

Expand All @@ -274,7 +274,9 @@ fn caddy_only_depends_on_proxied_apps() {
assert!(!deps.contains_key("nats"));
assert!(!deps.contains_key("agent"));
}
_ => panic!("expected conditional depends_on"),
docker_compose_types::DependsOnOptions::Simple(_) => {
panic!("expected conditional depends_on")
}
}
}

Expand Down Expand Up @@ -303,7 +305,9 @@ fn caddy_depends_on_all_routed_apps_only() {
assert!(deps.contains_key("web"));
assert!(!deps.contains_key("worker"));
}
_ => panic!("expected conditional depends_on"),
docker_compose_types::DependsOnOptions::Simple(_) => {
panic!("expected conditional depends_on")
}
}
}

Expand Down