summaryrefslogtreecommitdiff
path: root/test/pacman
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-27 09:33:27 -0500
committerDan McGee <dan@archlinux.org>2011-06-27 09:33:27 -0500
commit77a09c92c66bd06440be0ccb75daf07c620acbee (patch)
tree621e3b9181899773d411744522889ce8e673e7b1 /test/pacman
parent51ed7dff0d30a5dcb73ce271e5d02bdb0d119cb9 (diff)
parente378170c2555b656ef87715d8284d038037ced5f (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/conflict.c
Diffstat (limited to 'test/pacman')
-rw-r--r--test/pacman/tests/fileconflict008.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/test/pacman/tests/fileconflict008.py b/test/pacman/tests/fileconflict008.py
new file mode 100644
index 00000000..24ea8852
--- /dev/null
+++ b/test/pacman/tests/fileconflict008.py
@@ -0,0 +1,21 @@
+self.description = "Fileconflict file -> dir on package replacement (FS#24904)"
+
+lp = pmpkg("dummy")
+lp.files = ["dir/filepath",
+ "dir/file"]
+self.addpkg2db("local", lp)
+
+p1 = pmpkg("replace")
+p1.provides = ["dummy"]
+p1.replaces = ["dummy"]
+p1.files = ["dir/filepath/",
+ "dir/filepath/file",
+ "dir/file",
+ "dir/file2"]
+self.addpkg2db("sync", p1)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=dummy")
+self.addrule("PKG_EXIST=replace")