[pacman-dev] [PATCH 1/4] pactest: add a few more checks to fileconflict checks

[Dan McGee]

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 test/pacman/tests/fileconflict001.py |    3 +++
 test/pacman/tests/fileconflict002.py |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
index 8c13911..dec6151 100644
--- a/test/pacman/tests/fileconflict001.py
+++ b/test/pacman/tests/fileconflict001.py
@@ -2,6 +2,7 @@
 
 lp = pmpkg("dummy")
 lp.files = ["dir/realdir/",
+            "dir/realdir/realfile",
             "dir/symdir -> realdir"]
 self.addpkg2db("local", lp)
 
@@ -18,5 +19,7 @@
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("!PKG_EXIST=pkg2")
+self.addrule("FILE_EXIST=dir/realdir/realfile")
+self.addrule("!FILE_EXIST=dir/realdir/file")
 
 self.expectfailure = True
diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py
index f70873b..e107cd2 100644
--- a/test/pacman/tests/fileconflict002.py
+++ b/test/pacman/tests/fileconflict002.py
@@ -1,12 +1,16 @@
 self.description = "Fileconflict with symlinks (2)"
 
 p1 = pmpkg("pkg1")
-p1.files = ["dir/realdir/file",
+p1.files = ["dir/",
+            "dir/realdir/",
+            "dir/realdir/file",
             "dir/symdir -> realdir"]
 self.addpkg(p1)
 
 p2 = pmpkg("pkg2")
-p2.files = ["dir/symdir/file"]
+p2.files = ["dir/",
+            "dir/symdir/",
+            "dir/symdir/file"]
 self.addpkg(p2)
 
 self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
@@ -14,5 +18,6 @@
 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
-- 
1.7.6