summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-02-15 19:21:35 -0500
committerAllan McRae <allan@archlinux.org>2013-02-24 13:11:54 +1000
commit9995510dc81ab75fbb7ad7ca4fffedf8a5318bef (patch)
treeaf37fe72e675758f238b2e37928f49fbbf2ca16c /test
parent4a1d93b92c76bde58193083812dda94c0fa5d373 (diff)
return resolved paths from filelist_intersection
We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The additional file_t information was never used, so just return the resolved path. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/fileconflict022.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py
index 6f9aec93..5759d4c3 100644
--- a/test/pacman/tests/fileconflict022.py
+++ b/test/pacman/tests/fileconflict022.py
@@ -17,5 +17,3 @@ self.addrule("PACMAN_RETCODE=1")
self.addrule("PACMAN_OUTPUT=.*/usr/lib/file exists in both 'foo' and 'bar'")
self.addrule("!PKG_EXIST=foo")
self.addrule("!PKG_EXIST=bar")
-
-self.expectfailure = True