From 0b3d04719db189ad7dbc8b36b5f34d95a5c63646 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Fri, 10 May 2013 16:44:33 -0400 Subject: 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 Signed-off-by: Allan McRae --- test/pacman/tests/sync701.py | 2 -- test/pacman/tests/sync702.py | 2 -- 2 files changed, 4 deletions(-) (limited to 'test') 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 -- cgit v1.2.3-24-g4f1b