From c91d9484868f35e17dccc447d8c29cbb7978fb4f Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Fri, 10 May 2013 16:26:19 -0400 Subject: conflict.c: check for file -> dir replacements Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/tests/fileconflict007.py | 2 -- test/pacman/tests/symlink020.py | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 test/pacman/tests/symlink020.py (limited to 'test/pacman') 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 diff --git a/test/pacman/tests/symlink020.py b/test/pacman/tests/symlink020.py new file mode 100644 index 00000000..343add2d --- /dev/null +++ b/test/pacman/tests/symlink020.py @@ -0,0 +1,20 @@ +self.description = "symlink -> dir replacment" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/lib/foo", + "lib -> usr/lib/"] +self.addpkg2db("local", lp1) + +lp1 = pmpkg("pkg2") +lp1.files = ["usr/lib/bar"] +self.addpkg2db("local", lp1) + +sp = pmpkg("pkg1", "1.0-2") +sp.files = ["lib/bar"] +self.addpkg2db("sync", sp) + +self.args = "-S %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_TYPE=lib|dir") +self.addrule("FILE_TYPE=lib/bar|file") -- cgit v1.2.3-24-g4f1b