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

sleep: Fix duration parsing of multiple inputs when duration overflow should saturate and not panic

Browse source
This commit is contained in:
Joining7943 2023-02-26 07:32:07 +01:00
parent 5e851d4bde
commit 68f75af678
2 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/sleep/src/sleep.rs
View file

@ -69,7 +69,7 @@ fn sleep(args: &[&str]) -> UResult<()> {
Duration::new(0, 0)
}
});
let sleep_dur = intervals.fold(Duration::new(0, 0), |acc, n| acc + n);
let sleep_dur = intervals.fold(Duration::ZERO, |acc, n| acc.saturating_add(n));
if arg_error {
return Err(UUsageError::new(1, ""));
};

66
tests/by-util/test_sleep.rs
View file

@ -129,29 +129,55 @@ fn test_sleep_wrong_time() {
new_ucmd!().args(&["0.1s", "abc"]).fails();
}
// TODO These tests would obviously block for a very long time. We
// only want to verify that there is no error here, so we could just
// figure out a way to terminate the child process after a short
// period of time.
#[test]
fn test_sleep_when_single_input_exceeds_max_duration_then_no_error() {
let mut child = new_ucmd!()
.arg(format!("{}", u64::MAX as u128 + 1))
.timeout(Duration::from_secs(10))
.run_no_wait();
// #[test]
#[allow(dead_code)]
fn test_dont_overflow() {
new_ucmd!()
.arg("9223372036854775808d")
.succeeds()
.no_stderr()
.no_stdout();
#[cfg(unix)]
child
.delay(100)
.kill()
.make_assertion()
.with_current_output()
.signal_is(9) // make sure it was us who terminated the process
.no_output();
#[cfg(windows)]
child
.delay(100)
.kill()
.make_assertion()
.with_current_output()
.failure()
.no_output();
}
// #[test]
#[allow(dead_code)]
fn test_sum_overflow() {
new_ucmd!()
.args(&["100000000000000d", "100000000000000d", "100000000000000d"])
.succeeds()
.no_stderr()
.no_stdout();
#[test]
fn test_sleep_when_multiple_inputs_exceed_max_duration_then_no_error() {
let mut child = new_ucmd!()
.arg(format!("{}", u64::MAX))
.arg("1")
.timeout(Duration::from_secs(10))
.run_no_wait();
#[cfg(unix)]
child
.delay(100)
.kill()
.make_assertion()
.with_current_output()
.signal_is(9) // make sure it was us who terminated the process
.no_output();
#[cfg(windows)]
child
.delay(100)
.kill()
.make_assertion()
.with_current_output()
.failure()
.no_output();
}
#[test]