From c91d9484868f35e17dccc447d8c29cbb7978fb4f Mon Sep 17 00:00:00 2001
From: Andrew Gregory <andrew.gregory.8@gmail.com>
Date: Fri, 10 May 2013 16:26:19 -0400
Subject: conflict.c: check for file -> dir replacements

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
 test/pacman/tests/fileconflict007.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'test/pacman/tests/fileconflict007.py')

diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py
index b61ddb42..7fe65ed4 100644
--- a/test/pacman/tests/fileconflict007.py
+++ b/test/pacman/tests/fileconflict007.py
@@ -16,5 +16,3 @@ self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg")
 self.addrule("PKG_VERSION=pkg|1.0-2")
 self.addrule("FILE_TYPE=dir/symdir/|dir")
-
-self.expectfailure = True
-- 
cgit v1.2.3