summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-07-17 20:44:18 +1000
committerAllan McRae <allan@archlinux.org>2012-12-14 12:35:34 +1000
commit6860e2f7032aed392f2526a7fb72cbf08dd3c25f (patch)
tree09a2dd9e9e14d4bfc7646770b033295f61519c99
parent254329f6fb10a1fa59a0259fa5b2930530f63aae (diff)
downloadpacman-6860e2f7032aed392f2526a7fb72cbf08dd3c25f.tar.xz
pactest: Provide a full filelist to the pactests that need it
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@archlinux.org>
-rw-r--r--test/pacman/tests/fileconflict001.py8
-rw-r--r--test/pacman/tests/fileconflict016.py7
2 files changed, 11 insertions, 4 deletions
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
index dec61512..e1371f88 100644
--- a/test/pacman/tests/fileconflict001.py
+++ b/test/pacman/tests/fileconflict001.py
@@ -7,11 +7,15 @@ lp.files = ["dir/realdir/",
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 93797f64..56259846 100644
--- a/test/pacman/tests/fileconflict016.py
+++ b/test/pacman/tests/fileconflict016.py
@@ -7,11 +7,14 @@ lp1.files = ["usr/",
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"