Fixes file relocation pactests
This patch fixes upgrade040.py and upgrade041.py (041 now fails!): * the old pactests didn't check the existence of the relocated file * upgrade041.py was broken due to a typo (missing comma) New upgrade046.py pactest was added (derived from the fixed upgrade041.py). This fails because the file relocation check is _hacked_ to conflict.c, and _alpm_db_find_fileconflicts is not called in case of --force. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
parent
17180890a5
commit
7586072beb
|
@ -27,4 +27,5 @@
|
|||
self.addrule("PKG_EXIST=%s" % p.name)
|
||||
self.addrule("FILE_MODIFIED=bin/dummy")
|
||||
self.addrule("FILE_MODIFIED=bin/foobar")
|
||||
self.addrule("FILE_EXIST=usr/share/file")
|
||||
self.addrule("FILE_MODIFIED=usr/share/file")
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
lp1.files = ["bin/dummy"]
|
||||
|
||||
lp2 = pmpkg("foobar")
|
||||
lp2.files = ["bin/foobar"
|
||||
lp2.files = ["bin/foobar",
|
||||
"usr/share/file"]
|
||||
|
||||
for p in lp1, lp2:
|
||||
|
@ -27,4 +27,5 @@
|
|||
self.addrule("PKG_EXIST=%s" % p.name)
|
||||
self.addrule("FILE_MODIFIED=bin/dummy")
|
||||
self.addrule("FILE_MODIFIED=bin/foobar")
|
||||
self.addrule("FILE_EXIST=usr/share/file")
|
||||
self.addrule("FILE_MODIFIED=usr/share/file")
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
self.description = "File relocation between two packages (reverse order, --force)"
|
||||
|
||||
lp1 = pmpkg("dummy")
|
||||
lp1.files = ["bin/dummy"]
|
||||
|
||||
lp2 = pmpkg("foobar")
|
||||
lp2.files = ["bin/foobar",
|
||||
"usr/share/file"]
|
||||
|
||||
for p in lp1, lp2:
|
||||
self.addpkg2db("local", p)
|
||||
|
||||
p1 = pmpkg("dummy")
|
||||
p1.files = ["bin/dummy",
|
||||
"usr/share/file"]
|
||||
|
||||
p2 = pmpkg("foobar")
|
||||
p2.files = ["bin/foobar"]
|
||||
|
||||
for p in p1, p2:
|
||||
self.addpkg(p)
|
||||
|
||||
self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2])
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
for p in p1, p2:
|
||||
self.addrule("PKG_EXIST=%s" % p.name)
|
||||
self.addrule("FILE_MODIFIED=bin/dummy")
|
||||
self.addrule("FILE_MODIFIED=bin/foobar")
|
||||
self.addrule("FILE_EXIST=usr/share/file")
|
||||
self.addrule("FILE_MODIFIED=usr/share/file")
|
Loading…
Reference in New Issue