From a22d07b17744bb9c217a626c850fa79af21c3563 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sat, 16 Mar 2024 17:03:46 +0000 Subject: [PATCH] Fix tests that perform partial upgrades --- test/pacman/tests/epoch005.py | 2 +- test/pacman/tests/ignore005.py | 2 +- test/pacman/tests/sync140.py | 2 +- test/pacman/tests/sync141.py | 2 +- test/pacman/tests/sync306.py | 2 +- test/pacman/tests/sync992.py | 2 +- test/pacman/tests/unresolvable001.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/pacman/tests/epoch005.py b/test/pacman/tests/epoch005.py index 62151703..fc0abe24 100644 --- a/test/pacman/tests/epoch005.py +++ b/test/pacman/tests/epoch005.py @@ -17,7 +17,7 @@ for k, v in pkgvers: lp = pmpkg("pkg_%d" % k, versions[2]) self.addpkg2db("local", lp) -self.args = "-Su" +self.args = "-Su --partial" self.addrule("PACMAN_RETCODE=0") for k, v in pkgvers: diff --git a/test/pacman/tests/ignore005.py b/test/pacman/tests/ignore005.py index 51bcba39..682e34ba 100644 --- a/test/pacman/tests/ignore005.py +++ b/test/pacman/tests/ignore005.py @@ -36,7 +36,7 @@ self.addpkg2db("sync", packageA5up) self.option["IgnorePkg"] = ["packageA3"] -self.args = "-S packageA1 packageA2 --ask=16" +self.args = "-S packageA1 packageA2 --ask=16 --partial" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=packageA1|1.0-1") diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py index fbe750f2..15e78f74 100644 --- a/test/pacman/tests/sync140.py +++ b/test/pacman/tests/sync140.py @@ -18,7 +18,7 @@ sp3.depends = ["gcc-libs"] for p in sp1, sp2, sp3: self.addpkg2db("sync", p) -self.args = "-Su --ignore %s --ask=16" % sp1.name +self.args = "-Su --ignore %s --ask=16 --partial" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=glibc|1.0-1") diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py index 02f7be81..c0a74ddb 100644 --- a/test/pacman/tests/sync141.py +++ b/test/pacman/tests/sync141.py @@ -18,7 +18,7 @@ sp3.depends = ["b_gcc-libs"] for p in sp1, sp2, sp3: self.addpkg2db("sync", p) -self.args = "-Su --ignore %s --ask=16" % sp1.name +self.args = "-Su --ignore %s --ask=16 --partial" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=c_glibc|1.0-1") diff --git a/test/pacman/tests/sync306.py b/test/pacman/tests/sync306.py index c7401d07..936812d5 100644 --- a/test/pacman/tests/sync306.py +++ b/test/pacman/tests/sync306.py @@ -57,6 +57,6 @@ lp7 = pmpkg("db", "5.2.36-2") lp7.depends = ["gcc-libs"] self.addpkg2db("local", lp7) -self.args = "-S pacman" +self.args = "-S pacman --partial" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pacman|4.0.1-2") diff --git a/test/pacman/tests/sync992.py b/test/pacman/tests/sync992.py index 3b538933..300afce3 100644 --- a/test/pacman/tests/sync992.py +++ b/test/pacman/tests/sync992.py @@ -15,7 +15,7 @@ for p in sp1, sp2, sp3: lp1 = pmpkg("pkg2", "0.1-1") self.addpkg2db("local", lp1) -self.args = "-S %s --ask=4" % " ".join([p.name for p in (sp1, sp2)]) +self.args = "-S %s --ask=4 --partial" % " ".join([p.name for p in (sp1, sp2)]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/test/pacman/tests/unresolvable001.py b/test/pacman/tests/unresolvable001.py index 4e5da6f3..95bf981c 100644 --- a/test/pacman/tests/unresolvable001.py +++ b/test/pacman/tests/unresolvable001.py @@ -11,7 +11,7 @@ packageA2up = pmpkg("package") packageA2up.depends = ["dep"]; self.addpkg2db("sync", packageA2up) -self.args = "-S package dep --ask=16" +self.args = "-S package dep --ask=16 --partial" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=package")