@@ -541,7 +541,7 @@ mod tests {
541
541
let root = & passing_fixture ( ) ?;
542
542
let mut out = Vec :: new ( ) ;
543
543
let warnings = WarningDisposition :: FatalWarnings ;
544
- let root_type = RootType :: Running ;
544
+ let root_type = RootType :: Alternative ;
545
545
lint ( root, warnings, root_type, [ ] , & mut out) . unwrap ( ) ;
546
546
root. create_dir_all ( "var/run/foo" ) ?;
547
547
let mut out = Vec :: new ( ) ;
@@ -553,31 +553,30 @@ mod tests {
553
553
fn test_lint_inner ( ) -> Result < ( ) > {
554
554
let root = & passing_fixture ( ) ?;
555
555
556
- // Verify that all lints run except one which is skipped for non-running roots
556
+ // Verify that all lints run
557
557
let mut out = Vec :: new ( ) ;
558
- let root_type = RootType :: Running ;
558
+ let root_type = RootType :: Alternative ;
559
559
let r = lint_inner ( root, root_type, [ ] , & mut out) . unwrap ( ) ;
560
- let allbut_one = LINTS . len ( ) . checked_sub ( 1 ) . unwrap ( ) ;
561
- assert_eq ! ( r. passed, allbut_one) ;
560
+ assert_eq ! ( r. passed, LINTS . len( ) ) ;
562
561
assert_eq ! ( r. fatal, 0 ) ;
563
- assert_eq ! ( r. skipped, 1 ) ;
562
+ assert_eq ! ( r. skipped, 0 ) ;
564
563
assert_eq ! ( r. warnings, 0 ) ;
565
564
566
565
let r = lint_inner ( root, root_type, [ "var-log" ] , & mut out) . unwrap ( ) ;
567
566
// Trigger a failure in var-log
568
567
root. create_dir_all ( "var/log/dnf" ) ?;
569
568
root. write ( "var/log/dnf/dnf.log" , b"dummy dnf log" ) ?;
570
- assert_eq ! ( r. passed, allbut_one . checked_sub( 1 ) . unwrap( ) ) ;
569
+ assert_eq ! ( r. passed, LINTS . len ( ) . checked_sub( 1 ) . unwrap( ) ) ;
571
570
assert_eq ! ( r. fatal, 0 ) ;
572
- assert_eq ! ( r. skipped, 2 ) ;
571
+ assert_eq ! ( r. skipped, 1 ) ;
573
572
assert_eq ! ( r. warnings, 0 ) ;
574
573
575
- // But verify that not skipping it results in an error
574
+ // But verify that not skipping it results in a warning
576
575
let mut out = Vec :: new ( ) ;
577
576
let r = lint_inner ( root, root_type, [ ] , & mut out) . unwrap ( ) ;
578
- assert_eq ! ( r. passed, allbut_one . checked_sub( 1 ) . unwrap( ) ) ;
577
+ assert_eq ! ( r. passed, LINTS . len ( ) . checked_sub( 1 ) . unwrap( ) ) ;
579
578
assert_eq ! ( r. fatal, 0 ) ;
580
- assert_eq ! ( r. skipped, 1 ) ;
579
+ assert_eq ! ( r. skipped, 0 ) ;
581
580
assert_eq ! ( r. warnings, 1 ) ;
582
581
Ok ( ( ) )
583
582
}
0 commit comments