* Added 5 new upgrade tests, which check various things with depends,

provides, and conflicts.
  - upgrade051 is known to fail- but we want to eventually make it work.
  - upgrade052 is Nagy's bug as reported on the ML- I think. If it isn't,
    let me know.

pactest/tests/upgrade050.py

@@ -0,0 +1,15 @@
+self.description = "Upgrade package with a conflict == depend (not installed)"
+
+p1 = pmpkg("pkg1")
+p1.conflicts = ["pkg2"]
+p1.depends = ["pkg2"]
+self.addpkg(p1)
+
+p2 = pmpkg("pkg2")
+self.addpkg(p2)
+
+self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("!PKG_EXIST=pkg2")

pactest/tests/upgrade051.py

@@ -0,0 +1,15 @@
+self.description = "Upgrade to a package that provides another package"
+
+lp = pmpkg("pkg1")
+self.addpkg2db("local", lp)
+
+p = pmpkg("pkg2")
+p.conflicts = ["pkg1"]
+p.provides = ["pkg1"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")

pactest/tests/upgrade052.py

@@ -0,0 +1,19 @@
+self.description = "Nagy's bug (I think) -- in progress"
+
+lp1 = pmpkg("pkg1")
+lp1.depends = ["imaginary"]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg2")
+lp2.provides = ["imaginary", "real"]
+self.addpkg2db("local", lp2)
+
+p = pmpkg("pkg2", "1.0-2")
+p.provides = ["real"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_EXIST=pkg1")
+self.addrule("PKG_VERSION=pkg2|1.0-1")

pactest/tests/upgrade053.py

@@ -0,0 +1,19 @@
+self.description = "Upgrade a package with dependency on provided package (same)"
+
+lp1 = pmpkg("pkg1")
+lp1.depends = ["imaginary"]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg2")
+lp2.provides = ["imaginary", "real"]
+self.addpkg2db("local", lp2)
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["imaginary"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=pkg1|1.0-2")
+self.addrule("PKG_EXIST=pkg2")

pactest/tests/upgrade054.py

@@ -0,0 +1,19 @@
+self.description = "Upgrade a package with dependency on provided package (different)"
+
+lp1 = pmpkg("pkg1")
+lp1.depends = ["imaginary"]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg2")
+lp2.provides = ["imaginary", "real"]
+self.addpkg2db("local", lp2)
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["real"]
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=pkg1|1.0-2")
+self.addrule("PKG_EXIST=pkg2")