RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #3283 from jfinkels/timeout-usage-error

Browse source 
timeout: give usage error on invalid time interval
This commit is contained in:
Sylvestre Ledru 2022-03-21 09:27:58 +01:00 • committed by GitHub
commit d3e2ad2d50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/uu/timeout/src/timeout.rs
View file

@ -19,7 +19,7 @@ use std::io::ErrorKind;
use std::process::{self, Child, Stdio};
use std::time::Duration;
use uucore::display::Quotable;
use uucore::error::{UResult, USimpleError};
use uucore::error::{UResult, USimpleError, UUsageError};
use uucore::process::ChildExt;
use uucore::signals::{signal_by_name_or_value, signal_name_by_value};
use uucore::{format_usage, InvalidEncodingHandling};
@ -72,7 +72,7 @@ impl Config {
let duration =
match uucore::parse_time::from_str(options.value_of(options::DURATION).unwrap()) {
Ok(duration) => duration,
Err(err) => return Err(USimpleError::new(1, err)),
Err(err) => return Err(UUsageError::new(1, err)),
};
let preserve_status: bool = options.is_present(options::PRESERVE_STATUS);

8
tests/by-util/test_timeout.rs
View file

@ -11,6 +11,14 @@ fn test_subcommand_return_code() {
new_ucmd!().arg("1").arg("false").run().status_code(1);
}
#[test]
fn test_invalid_time_interval() {
new_ucmd!()
.args(&["xyz", "sleep", "0"])
.fails()
.usage_error("invalid time interval 'xyz'");
}
#[test]
fn test_command_with_args() {
new_ucmd!()