From 5699f2c94c39afec19810fc450b78dced86e7c5d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 26 Oct 2010 22:54:36 -0500 Subject: 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 --- test/pacman/README | 1 - test/pacman/tests/sync101.py | 5 ++++- test/pacman/tests/sync102.py | 7 ++++++- test/pacman/tests/sync103.py | 2 +- test/pacman/tests/sync120.py | 2 +- test/pacman/tests/sync138.py | 2 +- test/pacman/tests/sync898.py | 2 +- test/pacman/tests/upgrade001.py | 1 - test/pacman/tests/upgrade002.py | 1 - test/pacman/tests/upgrade003.py | 1 - 10 files changed, 14 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/pacman/README b/test/pacman/README index 8f97a17d..0bd02138 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -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 diff --git a/test/pacman/tests/sync101.py b/test/pacman/tests/sync101.py index 5d39ecb9..a4bde3e2 100644 --- a/test/pacman/tests/sync101.py +++ b/test/pacman/tests/sync101.py @@ -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.addpkg2db("local", lp) 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") diff --git a/test/pacman/tests/sync102.py b/test/pacman/tests/sync102.py index 40a7ec99..bbd72147 100644 --- a/test/pacman/tests/sync102.py +++ b/test/pacman/tests/sync102.py @@ -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.addpkg2db("local", lp) 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") diff --git a/test/pacman/tests/sync103.py b/test/pacman/tests/sync103.py index 15e7c8e1..b740294b 100644 --- a/test/pacman/tests/sync103.py +++ b/test/pacman/tests/sync103.py @@ -9,5 +9,5 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_MODIFIED=lpkg") +self.addrule("PKG_EXIST=lpkg") self.addrule("!PKG_EXIST=spkg") diff --git a/test/pacman/tests/sync120.py b/test/pacman/tests/sync120.py index 994e440e..d1ace800 100644 --- a/test/pacman/tests/sync120.py +++ b/test/pacman/tests/sync120.py @@ -18,4 +18,4 @@ self.args = "-Su" 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") diff --git a/test/pacman/tests/sync138.py b/test/pacman/tests/sync138.py index e67c4f46..bef07683 100644 --- a/test/pacman/tests/sync138.py +++ b/test/pacman/tests/sync138.py @@ -19,4 +19,4 @@ self.args = "-Su" 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") diff --git a/test/pacman/tests/sync898.py b/test/pacman/tests/sync898.py index af16801d..8fd59f19 100644 --- a/test/pacman/tests/sync898.py +++ b/test/pacman/tests/sync898.py @@ -14,5 +14,5 @@ self.addpkg2db("local", lp1) 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") diff --git a/test/pacman/tests/upgrade001.py b/test/pacman/tests/upgrade001.py index 2a9538e0..2e85ce67 100644 --- a/test/pacman/tests/upgrade001.py +++ b/test/pacman/tests/upgrade001.py @@ -12,7 +12,6 @@ self.addpkg(p) 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) diff --git a/test/pacman/tests/upgrade002.py b/test/pacman/tests/upgrade002.py index d561d894..c7706efe 100644 --- a/test/pacman/tests/upgrade002.py +++ b/test/pacman/tests/upgrade002.py @@ -12,7 +12,6 @@ self.addpkg(p) 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) diff --git a/test/pacman/tests/upgrade003.py b/test/pacman/tests/upgrade003.py index a67a2653..284c9f35 100644 --- a/test/pacman/tests/upgrade003.py +++ b/test/pacman/tests/upgrade003.py @@ -12,7 +12,6 @@ self.addpkg(p) 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) -- cgit v1.2.3-70-g09d2