summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-07-18 12:25:37 +1000
committerAllan McRae <allan@archlinux.org>2012-12-14 12:35:34 +1000
commitc1abfeae1ec39a196262622662850b7d277a4734 (patch)
tree2fc58a7cc94d5731117e3a454594bb63b6f4ca76 /test
parent6860e2f7032aed392f2526a7fb72cbf08dd3c25f (diff)
downloadpacman-c1abfeae1ec39a196262622662850b7d277a4734.tar.xz
Detect inter-package conflicts between files and directories
Detect a conflict between a file/symlink in one package and a directory in another when both are being installed at once. A side effect is the creation of conflicts between a directory symlink and a real directory (e.g lib -> usr/lib in pkg1 and /lib in pkg2). Given we can not guarantee pkg1 is installed before pkg2, this is a genuine conflict. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/fileconflict002.py2
-rw-r--r--test/pacman/tests/fileconflict015.py2
2 files changed, 0 insertions, 4 deletions
diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py
index e107cd2e..1e6113c1 100644
--- a/test/pacman/tests/fileconflict002.py
+++ b/test/pacman/tests/fileconflict002.py
@@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("!PKG_EXIST=pkg2")
self.addrule("!FILE_EXIST=dir/realdir/file")
-
-self.expectfailure = True
diff --git a/test/pacman/tests/fileconflict015.py b/test/pacman/tests/fileconflict015.py
index 78634d7e..3c80bbcc 100644
--- a/test/pacman/tests/fileconflict015.py
+++ b/test/pacman/tests/fileconflict015.py
@@ -13,5 +13,3 @@ self.args = "-S pkg1 pkg2"
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("!PKG_EXIST=pkg2")
-
-self.expectfailure = True