update tests for symlink support removal

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-03-02 23:26:56 -05:00 committed by Allan McRae
parent 9ca423b981
commit 0c41663c7b
9 changed files with 40 additions and 31 deletions

View File

@ -15,3 +15,4 @@
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")

View File

@ -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.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

View File

@ -14,6 +14,5 @@
self.args = "-S %s %s" % (sp1.name, sp2.name)
self.addrule("PACMAN_RETCODE=1")
self.addrule("PACMAN_OUTPUT=.*/usr/lib/file exists in both 'foo' and 'bar'")
self.addrule("!PKG_EXIST=foo")
self.addrule("!PKG_EXIST=bar")

View File

@ -1,4 +1,5 @@
self.description = "File conflict between package with symlink and package with real path resolved by removal"
# Note: this situation means the filesystem and local db are out of sync
self.filesystem = ["usr/", "usr/lib/", "lib -> usr/lib/"]
@ -13,6 +14,8 @@
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

View File

@ -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.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

View File

@ -11,10 +11,11 @@
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("FILE_EXIST=dir/symdir/tmp")
self.addrule("FILE_EXIST=dir/realdir/tmp")
self.addrule("FILE_TYPE=dir/symdir/tmp|file")
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("!FILE_EXIST=dir/symdir/tmp")
self.addrule("!FILE_EXIST=dir/realdir/tmp")
self.addrule("FILE_TYPE=dir/symdir|link")
self.addrule("FILE_TYPE=dir/realdir|dir")
self.expectfailure = True

View File

@ -1,4 +1,5 @@
self.description = "do not remove directory symlink if another package has file in its path"
self.description = "removal of directory symlink when another package has file in its path"
# Note: this situation means that the filesystem and local db are out of sync
lp1 = pmpkg("pkg1")
lp1.files = ["usr/lib/foo",
@ -15,8 +16,7 @@
self.args = "-S pkg1"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
self.addrule("FILE_EXIST=lib/bar")
self.expectfailure = True
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.addrule("FILE_EXIST=usr/lib/bar")
self.addrule("!FILE_EXIST=lib/bar")

View File

@ -1,4 +1,4 @@
self.description = "do not remove directory symlink if incoming package has file in its path (order 1)"
self.description = "incoming package replaces symlink with directory (order 1)"
lp = pmpkg("pkg1")
lp.files = ["usr/lib/foo",
@ -15,8 +15,7 @@
self.args = "-S pkg1 pkg2"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
self.addrule("!PKG_EXIST=pkg2")
self.expectfailure = True
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.addrule("PKG_EXIST=pkg2")
self.addrule("FILE_TYPE=lib|dir")

View File

@ -1,4 +1,4 @@
self.description = "do not remove directory symlink if incoming package has file in its path (order 2)"
self.description = "incoming package replaces symlink with directory (order 2)"
lp = pmpkg("pkg2")
lp.files = ["usr/lib/foo",
@ -15,8 +15,9 @@
self.args = "-S pkg1 pkg2"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg2|1.0-1")
self.addrule("!PKG_EXIST=pkg1")
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