diff options
| -rw-r--r-- | t/superuser--obsolete-and-conflict.t | 4 | ||||
| -rw-r--r-- | t/superuser--split-transactions--conflict.t | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/t/superuser--obsolete-and-conflict.t b/t/superuser--obsolete-and-conflict.t index 63996a5c..80fea2a5 100644 --- a/t/superuser--obsolete-and-conflict.t +++ b/t/superuser--obsolete-and-conflict.t @@ -21,7 +21,9 @@ urpmi_addmedia("$name $::pwd/media/$name"); test1(); test_with_ad('b c', 'b c d'); test_with_ad('--split-level 1 b c', 'b c d'); # perl-URPM fix for #31969 fixes this too ("d" used to be removed without asking) -test_with_ad('--auto c', 'c'); # WARNING: urpmi should promote new version of "b" instead of removing conflicting older packages + +# below need promotion of "b" (obsoleting "a") to work +test_with_ad('--auto c', 'b c d'); sub test1 { urpmi('a'); diff --git a/t/superuser--split-transactions--conflict.t b/t/superuser--split-transactions--conflict.t index e41eb724..160d0035 100644 --- a/t/superuser--split-transactions--conflict.t +++ b/t/superuser--split-transactions--conflict.t @@ -48,9 +48,9 @@ sub test_d { urpmi("--media $name-1 --auto a b c"); check_installed_fullnames('a-1-1', 'b-1-1', 'c-1-1'); - #- WARNING: below would need the promotion of "b-2" (upgraded from "b-1") + #- below need the promotion of "b-2" (upgraded from "b-1") to work urpmi("--media $name-2 --auto $option d"); - check_installed_fullnames_and_remove('d-1-1'); + check_installed_fullnames_and_remove('a-1-1', 'b-2-1', 'd-1-1'); } sub test_e { @@ -59,9 +59,9 @@ sub test_e { urpmi("--media $name-1 --auto e"); check_installed_fullnames('d-1-1', 'e-1-1'); - #- WARNING: below would need the promotion of "e-2" (upgraded from "e-1") + #- below need the promotion of "e-2" (upgraded from "e-1") to work urpmi("--media $name-2 --auto $option c"); - check_installed_fullnames_and_remove('c-1-1'); + check_installed_fullnames_and_remove('c-1-1', 'e-2-1'); } sub test_ae { |