diff options
-rw-r--r-- | t/data/SPECS/file-conflicts/h.spec | 23 | ||||
-rw-r--r-- | t/data/SPECS/file-conflicts/i.spec | 23 | ||||
-rw-r--r-- | t/superuser--file-conflicts.t | 15 |
3 files changed, 61 insertions, 0 deletions
diff --git a/t/data/SPECS/file-conflicts/h.spec b/t/data/SPECS/file-conflicts/h.spec new file mode 100644 index 00000000..90de1e35 --- /dev/null +++ b/t/data/SPECS/file-conflicts/h.spec @@ -0,0 +1,23 @@ +Summary: x +Name: h +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildArch: noarch + +%description +x + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/usr/share/man +echo h > $RPM_BUILD_ROOT/usr/share/man/foo + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +/usr/share/man/foo* + diff --git a/t/data/SPECS/file-conflicts/i.spec b/t/data/SPECS/file-conflicts/i.spec new file mode 100644 index 00000000..47e2c3fc --- /dev/null +++ b/t/data/SPECS/file-conflicts/i.spec @@ -0,0 +1,23 @@ +Summary: x +Name: i +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildArch: noarch + +%description +x + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/usr/share/man +echo i > $RPM_BUILD_ROOT/usr/share/man/foo + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +/usr/share/man/foo* + diff --git a/t/superuser--file-conflicts.t b/t/superuser--file-conflicts.t index 32e6ec1c..b2a8e6da 100644 --- a/t/superuser--file-conflicts.t +++ b/t/superuser--file-conflicts.t @@ -10,6 +10,8 @@ # a and gc/gc_/gd contains different file => should work # ga and a and gc/gc_ contains the same resulting file, through symlink in ga, with same content => should work # ga and a and gd contains the same resulting file, through symlink in ga, with different content => should fail +# +# h and i file conflicts, but on a manpage use strict; use lib '.', 't'; @@ -57,6 +59,9 @@ sub test_rpm_same_transaction { test_rpm_i_succeeds('fa', 'fb'); check_installed_and_remove('fa', 'fb'); + + test_rpm_i_succeeds('h', 'i'); + check_installed_and_remove('h', 'i'); } sub test_rpm_different_transactions { @@ -99,6 +104,10 @@ sub test_rpm_different_transactions { urpme('gc gc_'); # if you remove gc and a/ga at the same time, hell can happen... check_installed_and_remove('a', 'ga'); check_no_etc_files(); + + test_rpm_i_succeeds('h'); + test_rpm_i_succeeds('i'); + check_installed_and_remove('h', 'i'); } sub test_urpmi_same_transaction { @@ -127,6 +136,9 @@ sub test_urpmi_same_transaction { urpmi('fa fb'); check_installed_and_remove('fa', 'fb'); + + urpmi('h i'); + check_installed_and_remove('h', 'i'); } sub test_urpmi_different_transactions { @@ -171,6 +183,9 @@ sub test_urpmi_different_transactions { check_installed_and_remove('a', 'ga'); check_no_etc_files(); + urpmi('h'); + urpmi('i'); + check_installed_and_remove('h', 'i'); } sub test_rpm_i_succeeds { |