From d9bd24c968436f05838614b9069ef4f29645b74a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Feb 2007 06:50:42 +0000 Subject: * Changes to quite a few of the tests, mostly minimal changes (better descriptions, additional rules, etc) * One new pactest test regarding file migration between packages. * Fix of a little output bug in pmenv.py --- pactest/tests/sync043.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pactest/tests/sync043.py') diff --git a/pactest/tests/sync043.py b/pactest/tests/sync043.py index 200626d3..1302bf04 100644 --- a/pactest/tests/sync043.py +++ b/pactest/tests/sync043.py @@ -1,14 +1,18 @@ -self.description = "Install a sync package conflicting with a local one" +self.description = "Install a sync package conflicting with two local ones" sp = pmpkg("pkg1") -sp.conflicts = ["pkg2"] +sp.conflicts = ["pkg2", "pkg3"] self.addpkg2db("sync", sp); -lp = pmpkg("pkg2") -self.addpkg2db("local", lp); +lp1 = pmpkg("pkg2") +self.addpkg2db("local", lp1); -self.args = "-S pkg1" +lp1 = pmpkg("pkg3") +self.addpkg2db("local", lp1); + +self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") -- cgit v1.2.3-2-g168b