summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-05-10 16:44:33 -0400
committerAllan McRae <allan@archlinux.org>2013-06-03 13:33:47 +1000
commit0b3d04719db189ad7dbc8b36b5f34d95a5c63646 (patch)
tree757211785e120fe348a34d1de40194e8bb4181b7 /test
parentaa7e42db11ea545572a9519e88e2a6cdeeffb3bf (diff)
downloadpacman-0b3d04719db189ad7dbc8b36b5f34d95a5c63646.tar.xz
conflict.c: exclude trailing slash from file path
After the initial checks, we either use the path as a directory and have to append the trailing slash anyway or use it as a file in which case the trailing slash should be excluded. 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/sync701.py2
-rw-r--r--test/pacman/tests/sync702.py2
2 files changed, 0 insertions, 4 deletions
diff --git a/test/pacman/tests/sync701.py b/test/pacman/tests/sync701.py
index 912c794c..590845ff 100644
--- a/test/pacman/tests/sync701.py
+++ b/test/pacman/tests/sync701.py
@@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.addrule("PKG_EXIST=pkg2")
self.addrule("FILE_TYPE=lib|dir")
-
-self.expectfailure = True
diff --git a/test/pacman/tests/sync702.py b/test/pacman/tests/sync702.py
index 8f4c0ad7..c3e2320a 100644
--- a/test/pacman/tests/sync702.py
+++ b/test/pacman/tests/sync702.py
@@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg2|1.0-2")
self.addrule("PKG_EXIST=pkg1")
self.addrule("FILE_TYPE=lib|dir")
-
-self.expectfailure = True