pacman/pactest/tests/depconflict111.py

self.description = "conflict with version (no conflict)"

p = pmpkg("pkg1")
p.conflicts = ["pkg2=1.0-2"]
self.addpkg(p);

lp = pmpkg("pkg2", "1.0-1")
self.addpkg2db("local", lp)

self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
Add two pactest for versioned conflicts. A side effect of the previous commit ( ea9a756eeaca7398c0860b55f8abe2932ad195bd ) is that it's now possible to use versioned conflicts. Add two new conflict pactests for showing it. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> 2007-08-04 11:08:03 -04:00			`self.description = "conflict with version (no conflict)"`

			`p = pmpkg("pkg1")`
			`p.conflicts = ["pkg2=1.0-2"]`
			`self.addpkg(p);`

			`lp = pmpkg("pkg2", "1.0-1")`
			`self.addpkg2db("local", lp)`

Move -A pactests that are relevant to -U, clean the rest out This is in anticipation of removing the -A/--add option from the pacman frontend. I've went through each of the pacman pactests that used the -A operation and decided whether they were worth keeping, whether there was already an upgrade test doing the same thing, or whether it should be moved over. The GIT rename log should make several of the moves obvious, but for those that were deleted: add001: handled by upgrade004 add002: worthless add004: worthless add010: handled by upgrade011 add050: handled by upgrade010 Signed-off-by: Dan McGee <dan@archlinux.org> 2008-03-08 15:04:06 -05:00			`self.args = "-U %s" % p.filename()`
Add two pactest for versioned conflicts. A side effect of the previous commit ( ea9a756eeaca7398c0860b55f8abe2932ad195bd ) is that it's now possible to use versioned conflicts. Add two new conflict pactests for showing it. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> 2007-08-04 11:08:03 -04:00			`self.addrule("PACMAN_RETCODE=0")`
			`self.addrule("PKG_EXIST=pkg1")`
			`self.addrule("PKG_EXIST=pkg2")`