diff options
| -rw-r--r-- | t/superuser--obsolete-and-conflict.t | 2 | ||||
| -rw-r--r-- | t/superuser--ordering-scriptlets.t | 4 | ||||
| -rw-r--r-- | t/superuser--split-transactions--conflict.t | 8 | ||||
| -rw-r--r-- | t/superuser--split-transactions--promote.t | 2 | ||||
| -rw-r--r-- | t/superuser--split-transactions--strict-require-and-obsolete.t | 4 | ||||
| -rw-r--r-- | t/superuser--split-transactions--strict-require.t | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/t/superuser--obsolete-and-conflict.t b/t/superuser--obsolete-and-conflict.t index 545ede1e..343f9ed0 100644 --- a/t/superuser--obsolete-and-conflict.t +++ b/t/superuser--obsolete-and-conflict.t @@ -20,7 +20,7 @@ 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('--split-level 1 --split-length 1 b c', 'b c d'); # perl-URPM fix for #31969 fixes this too ("d" used to be removed without asking) # below need promotion of "b" (obsoleting "a") to work test_with_ad('--auto c', 'b c d'); diff --git a/t/superuser--ordering-scriptlets.t b/t/superuser--ordering-scriptlets.t index ae9c81a7..6f29ce9d 100644 --- a/t/superuser--ordering-scriptlets.t +++ b/t/superuser--ordering-scriptlets.t @@ -19,8 +19,8 @@ test_install_upgrade_rpm("requires_$_") foreach qw(preun postun); test_install_remove_urpmi("requires_$_", '') foreach qw(pre post preun postun); test_install_upgrade_urpmi("requires_$_", '') foreach qw(preun postun); -test_install_remove_urpmi("requires_$_", '--split-level 1') foreach qw(pre post preun postun); -test_install_upgrade_urpmi("requires_$_", '--split-level 1') foreach qw(preun postun); +test_install_remove_urpmi("requires_$_", '--split-level 1 --split-length 1') foreach qw(pre post preun postun); +test_install_upgrade_urpmi("requires_$_", '--split-level 1 --split-length 1') foreach qw(preun postun); sub test_install_remove_rpm { my ($name) = @_; diff --git a/t/superuser--split-transactions--conflict.t b/t/superuser--split-transactions--conflict.t index 160d0035..d34f7b66 100644 --- a/t/superuser--split-transactions--conflict.t +++ b/t/superuser--split-transactions--conflict.t @@ -21,16 +21,16 @@ urpmi_addmedia("$name-1 $::pwd/media/$name-1"); urpmi_addmedia("$name-2 $::pwd/media/$name-2"); test('--split-length 0'); -test('--split-level 1'); +test('--split-level 1 --split-length 1'); test_d('--split-length 0'); -test_d('--split-level 1'); +test_d('--split-level 1 --split-length 1'); test_e('--split-length 0'); -test_e('--split-level 1'); +test_e('--split-level 1 --split-length 1'); test_ae('--split-length 0'); -test_ae('--split-level 1'); +test_ae('--split-level 1 --split-length 1'); sub test { my ($option) = @_; diff --git a/t/superuser--split-transactions--promote.t b/t/superuser--split-transactions--promote.t index 112afe95..2fc80958 100644 --- a/t/superuser--split-transactions--promote.t +++ b/t/superuser--split-transactions--promote.t @@ -29,7 +29,7 @@ urpmi_addmedia("$name-1 $::pwd/media/$name-1"); urpmi_addmedia("$name-2 $::pwd/media/$name-2"); test('--split-length 0'); -test('--split-level 1'); +test('--split-level 1 --split-length 1'); test_conflict(); sub test { diff --git a/t/superuser--split-transactions--strict-require-and-obsolete.t b/t/superuser--split-transactions--strict-require-and-obsolete.t index 0f8df7b5..ded6afe0 100644 --- a/t/superuser--split-transactions--strict-require-and-obsolete.t +++ b/t/superuser--split-transactions--strict-require-and-obsolete.t @@ -20,10 +20,10 @@ urpmi_addmedia("$name-1 $::pwd/media/$name-1"); urpmi_addmedia("$name-2 $::pwd/media/$name-2"); test('--split-length 0'); -test('--split-level 1'); # was broken (#31969) +test('--split-level 1 --split-length 1'); # was broken (#31969) test_c('--split-length 0'); -test_c('--split-level 1'); +test_c('--split-level 1 --split-length 1'); sub test { my ($option) = @_; diff --git a/t/superuser--split-transactions--strict-require.t b/t/superuser--split-transactions--strict-require.t index 086cde81..7c48d479 100644 --- a/t/superuser--split-transactions--strict-require.t +++ b/t/superuser--split-transactions--strict-require.t @@ -25,9 +25,9 @@ urpmi_addmedia("$name-1 $::pwd/media/$name-1"); urpmi_addmedia("$name-2 $::pwd/media/$name-2"); test('--split-length 0'); -test('--split-level 1'); +test('--split-level 1 --split-length 1'); -test_c('--split-level 1'); +test_c('--split-level 1 --split-length 1'); # test_d(); # ERROR #34224: urpmi goes crazy, saying: |