summaryrefslogtreecommitdiffstats
path: root/test/pacman/tests/fileconflict025.py
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-03-03 05:26:56 +0100
committerAllan McRae <allan@archlinux.org>2013-06-03 05:33:47 +0200
commit0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (patch)
treede9a9eeb6510be5992a5c8534029b72d8c7922d0 /test/pacman/tests/fileconflict025.py
parent9ca423b981c897c7d3894c5b394c23d786e4ba37 (diff)
downloadpacman-0c41663c7b5a9d73ea49c20b74149d12f0fcd26c.tar.gz
pacman-0c41663c7b5a9d73ea49c20b74149d12f0fcd26c.tar.xz
update tests for symlink support removal
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict025.py')
-rw-r--r--test/pacman/tests/fileconflict025.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/pacman/tests/fileconflict025.py b/test/pacman/tests/fileconflict025.py
index 3c6f0638..195badbc 100644
--- a/test/pacman/tests/fileconflict025.py
+++ b/test/pacman/tests/fileconflict025.py
@@ -1,4 +1,4 @@
-self.description = "File conflict between package with symlink and package with real path resolved by removal (reversed)"
+self.description = "File conflict between package with symlink and package with real path and filesystem (reversed)"
self.filesystem = ["usr/lib/", "lib -> usr/lib/"]
@@ -13,6 +13,8 @@ self.addpkg2db("sync", sp1)
self.args = "-S %s --ask=4" % sp1.name
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("!PKG_EXIST=foo")
-self.addrule("PKG_EXIST=bar")
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_EXIST=foo")
+self.addrule("!PKG_EXIST=bar")
+
+self.expectfailure = True