Modify all pactests to not use PKG_MODIFIED
All conditions that this particular rule tested are better served by using a more specific rule, whether that be checking a package version or whether files inside the package have changed or still exist. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
2a3b5e40bc
commit
5699f2c94c
|
@ -290,7 +290,6 @@ challenge the requested data with it.
|
|||
Possible rules are:
|
||||
|
||||
PKG_EXIST=name
|
||||
PKG_MODIFIED=name
|
||||
PKG_VERSION=name|version
|
||||
PKG_GROUPS=name|group
|
||||
PKG_PROVIDES=name|providename
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
self.description = "Sysupgrade with same version for local and sync packages"
|
||||
|
||||
sp = pmpkg("dummy")
|
||||
sp.files = ["bin/foo"]
|
||||
lp = pmpkg("dummy")
|
||||
lp.files = ["bin/foo"]
|
||||
|
||||
self.addpkg2db("sync", sp)
|
||||
self.addpkg2db("local", lp)
|
||||
|
@ -9,4 +11,5 @@
|
|||
self.args = "-Su"
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("!PKG_MODIFIED=dummy")
|
||||
self.addrule("PKG_VERSION=dummy|1.0-1")
|
||||
self.addrule("!FILE_MODIFIED=bin/foo")
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
self.description = "Sysupgrade with a newer local package"
|
||||
|
||||
sp = pmpkg("dummy", "0.9-1")
|
||||
sp.files = ["bin/foo", "bin/bar"]
|
||||
lp = pmpkg("dummy")
|
||||
lp.files = ["bin/foo", "bin/baz"]
|
||||
|
||||
self.addpkg2db("sync", sp)
|
||||
self.addpkg2db("local", lp)
|
||||
|
@ -9,4 +11,7 @@
|
|||
self.args = "-Su"
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("!PKG_MODIFIED=dummy")
|
||||
self.addrule("PKG_VERSION=dummy|1.0-1")
|
||||
self.addrule("FILE_EXIST=bin/foo")
|
||||
self.addrule("FILE_EXIST=bin/baz")
|
||||
self.addrule("!FILE_EXIST=bin/bar")
|
||||
|
|
|
@ -9,5 +9,5 @@
|
|||
self.args = "-Su"
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("!PKG_MODIFIED=lpkg")
|
||||
self.addrule("PKG_EXIST=lpkg")
|
||||
self.addrule("!PKG_EXIST=spkg")
|
||||
|
|
|
@ -18,4 +18,4 @@
|
|||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||
self.addrule("!PKG_MODIFIED=pkg2")
|
||||
self.addrule("PKG_VERSION=pkg2|1.0-1")
|
||||
|
|
|
@ -19,4 +19,4 @@
|
|||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||
self.addrule("!PKG_MODIFIED=pkg2")
|
||||
self.addrule("PKG_VERSION=pkg2|1.0-1")
|
||||
|
|
|
@ -14,5 +14,5 @@
|
|||
self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_MODIFIED=pkg1")
|
||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||
self.addrule("!PKG_EXIST=pkg2")
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
self.args = "-U %s" % p.filename()
|
||||
|
||||
self.addrule("PKG_MODIFIED=dummy")
|
||||
self.addrule("PKG_VERSION=dummy|1.0-2")
|
||||
for f in lp.files:
|
||||
self.addrule("FILE_MODIFIED=%s" % f)
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
self.args = "-U %s" % p.filename()
|
||||
|
||||
self.addrule("PKG_MODIFIED=dummy")
|
||||
self.addrule("PKG_VERSION=dummy|1.0-1")
|
||||
for f in lp.files:
|
||||
self.addrule("FILE_MODIFIED=%s" % f)
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
self.args = "-U %s" % p.filename()
|
||||
|
||||
self.addrule("PKG_MODIFIED=dummy")
|
||||
self.addrule("PKG_VERSION=dummy|1.0-1")
|
||||
for f in lp.files:
|
||||
self.addrule("FILE_MODIFIED=%s" % f)
|
||||
|
|
Loading…
Reference in New Issue