diff options
Diffstat (limited to 't/superuser--file-conflicts.t')
| -rw-r--r-- | t/superuser--file-conflicts.t | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/t/superuser--file-conflicts.t b/t/superuser--file-conflicts.t index 4fade655..d3fcf03b 100644 --- a/t/superuser--file-conflicts.t +++ b/t/superuser--file-conflicts.t @@ -30,9 +30,12 @@ test_urpmi_same_transaction(); test_urpmi_different_transactions(); sub test_rpm_same_transaction { - # ERROR: disabled, fail (#32528) - #test_rpm_i_fail('a', 'b'); - #check_nothing_installed(); + if (rpm_is_jbj_version()) { + # ERROR: disabled, fail (#32528) + } else { + test_rpm_i_fail('a', 'b'); + check_nothing_installed(); + } test_rpm_i_succeeds('a', 'c'); check_installed_and_remove('a', 'c'); @@ -40,9 +43,12 @@ sub test_rpm_same_transaction { test_rpm_i_succeeds('a', 'd'); check_installed_and_remove('a', 'd'); - # ERROR: disabled, fail (#32528) - #test_rpm_i_fail('a', 'e'); - #check_nothing_installed(); + if (rpm_is_jbj_version()) { + # ERROR: disabled, fail (#32528) + } else { + test_rpm_i_fail('a', 'e'); + check_nothing_installed(); + } } sub test_rpm_different_transactions { @@ -80,9 +86,12 @@ sub test_rpm_different_transactions { } sub test_urpmi_same_transaction { - # ERROR: disabled, fail (#32528) - #test_urpmi_fail('a', 'b'); - #check_nothing_installed(); + if (rpm_is_jbj_version()) { + # ERROR: disabled, fail (#32528) + } else { + test_urpmi_fail('a b'); + check_nothing_installed(); + } urpmi('a c'); check_installed_and_remove('a', 'c'); @@ -90,9 +99,12 @@ sub test_urpmi_same_transaction { urpmi('a d'); check_installed_and_remove('a', 'd'); - # ERROR: disabled, fail (#32528) - #urpmi('a e'); - #check_installed_and_remove('a', 'e'); + if (rpm_is_jbj_version()) { + # ERROR: disabled, fail (#32528) + } else { + test_urpmi_fail('a e'); + check_nothing_installed(); + } } sub test_urpmi_different_transactions { |