From 9972767c60abe88e5e1e8085a9c3508755727787 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 18 Jan 2008 17:29:53 +0000 Subject: adapt to rpm patch change: - allow conflicting ghost file types as sometimes the same ghost file is a file in one package and a symlink in another package (modifies rpm-4.4.2.2-allow-conflicting-ghost-files.patch) --- t/superuser--file-conflicts.t | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/t/superuser--file-conflicts.t b/t/superuser--file-conflicts.t index d341de95..32e6ec1c 100644 --- a/t/superuser--file-conflicts.t +++ b/t/superuser--file-conflicts.t @@ -52,9 +52,8 @@ sub test_rpm_same_transaction { check_nothing_installed(); } - # WARNING: should it really fail? - test_rpm_i_fail('a', 'fa'); - check_nothing_installed(); + test_rpm_i_succeeds('a', 'fa'); + check_installed_and_remove('a', 'fa'); test_rpm_i_succeeds('fa', 'fb'); check_installed_and_remove('fa', 'fb'); @@ -75,10 +74,9 @@ sub test_rpm_different_transactions { test_rpm_i_succeeds('d'); check_installed_and_remove('a', 'd'); - # WARNING: should it really fail? test_rpm_i_succeeds('a'); - test_rpm_i_fail('fa'); - check_installed_and_remove('a'); + test_rpm_i_succeeds('fa'); + check_installed_and_remove('a', 'fa'); test_rpm_i_succeeds('fa'); test_rpm_i_succeeds('fb'); @@ -124,9 +122,8 @@ sub test_urpmi_same_transaction { check_nothing_installed(); } - # WARNING: should it really fail? - test_urpmi_fail('a fa'); - check_nothing_installed(); + urpmi('a fa'); + check_installed_and_remove('a', 'fa'); urpmi('fa fb'); check_installed_and_remove('fa', 'fb'); @@ -149,8 +146,8 @@ sub test_urpmi_different_transactions { check_installed_and_remove('a', 'd'); urpmi('a'); - test_urpmi_fail('fa'); - check_installed_and_remove('a'); + urpmi('fa'); + check_installed_and_remove('a', 'fa'); urpmi('fa'); urpmi('fb'); -- cgit v1.2.1