[pacman-dev] [PATCH] Provide a full filelist to the pactests that need it

[Allan McRae]

It turns out when you set the filelist for a package to include
"usr/lib/foo" in the pactest suite, it thinks there is only the
file "usr/lib/foo" in there...  No "usr/" or "usr/lib/" directory.
This makes life difficult when testing code that scrolls through
a filelist looking for directory entries.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 test/pacman/tests/fileconflict001.py | 8 ++++++--
 test/pacman/tests/fileconflict016.py | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
index dec6151..e1371f8 100644
--- a/test/pacman/tests/fileconflict001.py
+++ b/test/pacman/tests/fileconflict001.py
@@ -7,11 +7,15 @@
 self.addpkg2db("local", lp)
 
 p1 = pmpkg("pkg1")
-p1.files = ["dir/realdir/file"]
+p1.files = ["dir/",
+            "dir/realdir/",
+            "dir/realdir/file"]
 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])
diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py
index 93797f6..5625984 100644
--- a/test/pacman/tests/fileconflict016.py
+++ b/test/pacman/tests/fileconflict016.py
@@ -7,11 +7,14 @@
 self.addpkg2db("local", lp1)
 
 p1 = pmpkg("pkg1")
-p1.files = ["lib/foo"]
+p1.files = ["lib/",
+            "lib/foo"]
 self.addpkg2db("sync", p1)
 
 p2 = pmpkg("pkg2")
-p2.files = ["usr/lib/foo"]
+p2.files = ["usr/",
+            "usr/lib/",
+	    "usr/lib/foo"]
 self.addpkg2db("sync", p2)
 
 self.args = "-S pkg1 pkg2"
-- 
1.7.11.2