Date: Monday, February 26, 2007 @ 20:34:08 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: upgrade050.py (1.1) upgrade051.py (1.1) upgrade052.py (1.1) upgrade053.py (1.1) upgrade054.py (1.1) * 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. ---------------+ upgrade050.py | 15 +++++++++++++++ upgrade051.py | 15 +++++++++++++++ upgrade052.py | 19 +++++++++++++++++++ upgrade053.py | 19 +++++++++++++++++++ upgrade054.py | 19 +++++++++++++++++++ 5 files changed, 87 insertions(+) Index: pacman-lib/pactest/tests/upgrade050.py diff -u /dev/null pacman-lib/pactest/tests/upgrade050.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade050.py Mon Feb 26 20:34:07 2007 @@ -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") Index: pacman-lib/pactest/tests/upgrade051.py diff -u /dev/null pacman-lib/pactest/tests/upgrade051.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade051.py Mon Feb 26 20:34:08 2007 @@ -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") Index: pacman-lib/pactest/tests/upgrade052.py diff -u /dev/null pacman-lib/pactest/tests/upgrade052.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade052.py Mon Feb 26 20:34:08 2007 @@ -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") Index: pacman-lib/pactest/tests/upgrade053.py diff -u /dev/null pacman-lib/pactest/tests/upgrade053.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade053.py Mon Feb 26 20:34:08 2007 @@ -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") Index: pacman-lib/pactest/tests/upgrade054.py diff -u /dev/null pacman-lib/pactest/tests/upgrade054.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade054.py Mon Feb 26 20:34:08 2007 @@ -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")