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

df: fix calculation of Use% column

Browse source 
Change formula from: "Used/Size * 100" to "Used/(Used + Avail) * 100".
This formula also works if "Used" and "Avail" do not add up to "Size",
which is the case if there are reserved disk blocks.
This commit is contained in:
Daniel Hofstetter 2022-03-25 10:46:13 +01:00 • committed by Sylvestre Ledru
parent d6fd701511
commit e152ebaead
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/by-util/test_df.rs
View file

@ -1,4 +1,4 @@
// spell-checker:ignore udev
// spell-checker:ignore udev pcent
use crate::common::util::*;
#[test]
@ -139,33 +139,24 @@ fn test_total() {
#[test]
fn test_use_percentage() {
// Example output:
//
// Filesystem 1K-blocks Used Available Use% Mounted on
// udev 3858016 0 3858016 0% /dev
// ...
// /dev/loop14 63488 63488 0 100% /snap/core20/1361
let output = new_ucmd!().succeeds().stdout_move_str();
let output = new_ucmd!()
.args(&["--output=used,avail,pcent"])
.succeeds()
.stdout_move_str();
// Skip the header line.
let lines: Vec<&str> = output.lines().skip(1).collect();
for line in lines {
let mut iter = line.split_whitespace();
iter.next();
let reported_size = iter.next().unwrap().parse::<f64>().unwrap();
let reported_used = iter.next().unwrap().parse::<f64>().unwrap();
// Skip "Available" column
iter.next();
if cfg!(target_os = "macos") {
// Skip "Capacity" column
iter.next();
}
let reported_avail = iter.next().unwrap().parse::<f64>().unwrap();
let reported_percentage = iter.next().unwrap();
let reported_percentage = reported_percentage[..reported_percentage.len() - 1]
.parse::<u8>()
.unwrap();
let computed_percentage = (100.0 * (reported_used / reported_size)).ceil() as u8;
let computed_percentage =
(100.0 * (reported_used / (reported_used + reported_avail))).ceil() as u8;
assert_eq!(computed_percentage, reported_percentage);
}