Merge pull request #3297 from jfinkels/timeout-invalid-signal

timeout: produce usage error on invalid signal
This commit is contained in:
Sylvestre Ledru
2022-03-23 21:05:34 +01:00
committed by GitHub
2 changed files with 12 additions and 1 deletions
+4 -1
View File
@@ -57,7 +57,10 @@ impl Config {
let signal_result = signal_by_name_or_value(signal_);
match signal_result {
None => {
unreachable!("invalid signal {}", signal_.quote());
return Err(UUsageError::new(
ExitStatus::TimeoutFailed.into(),
format!("{}: invalid signal", signal_.quote()),
))
}
Some(signal_value) => signal_value,
}
+8
View File
@@ -97,3 +97,11 @@ fn test_negative_interval() {
.fails()
.usage_error("invalid time interval '-1'");
}
#[test]
fn test_invalid_signal() {
new_ucmd!()
.args(&["-s", "invalid", "1", "sleep", "0"])
.fails()
.usage_error("'invalid': invalid signal");
}