summaryrefslogtreecommitdiffstats
path: root/test/pacman/tests/fileconflict013.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/fileconflict013.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/fileconflict013.py')
-rw-r--r--test/pacman/tests/fileconflict013.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict013.py b/test/pacman/tests/fileconflict013.py
index a83923c6..5c3a43b1 100644
--- a/test/pacman/tests/fileconflict013.py
+++ b/test/pacman/tests/fileconflict013.py
@@ -1,4 +1,5 @@
self.description = "file->file path change with same effective path (/lib as symlink)"
+# Note: this situation means the filesystem and local db are out of sync
lp1 = pmpkg("filesystem", "1.0-1")
lp1.files = ["usr/",
@@ -16,5 +17,7 @@ self.addpkg2db("sync", sp1)
self.args = "-Su"
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_VERSION=pkg1|1.0-2")
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=pkg1|1.0-1")
+
+self.expectfailure = True