Fix for sync1003 and sync1004 pactests

checkdeps and resolvedeps now take both a remove list and an install list as
arguments, allowing dependencies to be calculated correctly.

This broke the sync990 pactest, but this pactest used dependencies and
provides in an unusual way, so it has been changed.

Dan: the sync990 pactest was just plain wrong. It didn't satisfy the
dependencies correctly, so should never have succeeded.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
[Dan: some variable renaming, clarification in commit message]
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/pactest/tests/sync990.py b/pactest/tests/sync990.py
index ee6a590b..6ac5a1f6 100644
--- a/pactest/tests/sync990.py
+++ b/pactest/tests/sync990.py
@@ -7,14 +7,13 @@ sp2 = pmpkg("pkg2")
 
 sp3 = pmpkg("pkg3")
 sp3.conflicts = ["pkg2"]
-sp3.provides = ["pkg2"]
 
 for p in sp1, sp2, sp3:
 	self.addpkg2db("sync", p)
 
 self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
 
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_EXIST=pkg2")
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("!PKG_EXIST=pkg2")
 self.addrule("!PKG_EXIST=pkg3")