[pacman-dev] [PATCH] pactest: conflict between directory and a file

[Allan McRae]

Note failure to detect a conflict between a directory in one package
and a file in the other when the directory is not currently on the
filesystem.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 test/pacman/tests/fileconflict015.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 test/pacman/tests/fileconflict015.py

diff --git a/test/pacman/tests/fileconflict015.py b/test/pacman/tests/fileconflict015.py
new file mode 100644
index 0000000..78634d7
--- /dev/null
+++ b/test/pacman/tests/fileconflict015.py
@@ -0,0 +1,17 @@
+self.description = "conflict between a directory and a file"
+
+p1 = pmpkg("pkg1")
+p1.files = ["foo/"]
+self.addpkg2db("sync", p1)
+
+p2 = pmpkg("pkg2")
+p2.files = ["foo"]
+self.addpkg2db("sync", p2)
+
+self.args = "-S pkg1 pkg2"
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("!PKG_EXIST=pkg2")
+
+self.expectfailure = True
-- 
1.7.11.2