From 01c49854f878fcd4c1a0250706f6521ac582ac74 Mon Sep 17 00:00:00 2001 From: mulhern Date: Thu, 22 Aug 2024 22:30:15 -0400 Subject: [PATCH] Modify assertions to something less cumbersome Signed-off-by: mulhern --- .../strat_engine/backstore/blockdevmgr.rs | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/engine/strat_engine/backstore/blockdevmgr.rs b/src/engine/strat_engine/backstore/blockdevmgr.rs index 55cc26a6b8..0b18c34078 100644 --- a/src/engine/strat_engine/backstore/blockdevmgr.rs +++ b/src/engine/strat_engine/backstore/blockdevmgr.rs @@ -636,17 +636,15 @@ mod tests { ) .unwrap(); assert_eq!( - mgr.sizer().avail_space().sectors() + mgr.sizer().metadata_size().sectors(), - mgr.sizer().size().sectors() + mgr.sizer().avail_space().sectors(), + mgr.sizer().usable_size().sectors() ); let allocated = Sectors(2); mgr.alloc(&[allocated]).unwrap(); assert_eq!( - mgr.sizer().avail_space().sectors() - + allocated - + mgr.sizer().metadata_size().sectors(), - mgr.sizer().size().sectors() + mgr.sizer().avail_space().sectors() + allocated, + mgr.sizer().usable_size().sectors() ); } @@ -859,17 +857,15 @@ mod tests { ) .unwrap(); assert_eq!( - mgr.sizer().avail_space().sectors() + mgr.sizer().metadata_size().sectors(), - mgr.sizer().size().sectors() + mgr.sizer().avail_space().sectors(), + mgr.sizer().usable_size().sectors() ); let allocated = Sectors(2); mgr.alloc(&[allocated]).unwrap(); assert_eq!( - mgr.sizer().avail_space().sectors() - + allocated - + mgr.sizer().metadata_size().sectors(), - mgr.sizer().size().sectors() + mgr.sizer().avail_space().sectors() + allocated, + mgr.sizer().usable_size().sectors() ); }