From 1dca8b630937450ba66351f53c5ce3e59f14732c Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Mon, 14 Jan 2008 20:02:01 +0100 Subject: [PATCH] Rename provision related pactests to provision*.py. Also add 3 new pactests to cover both the -U and -S operations for versioned provisions. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- pactest/tests/{sync500.py => provision001.py} | 0 pactest/tests/{sync501.py => provision002.py} | 0 pactest/tests/{add043.py => provision010.py} | 2 +- pactest/tests/{add044.py => provision011.py} | 2 +- pactest/tests/{add045.py => provision012.py} | 2 +- pactest/tests/provision020.py | 15 +++++++++++++++ pactest/tests/provision021.py | 15 +++++++++++++++ pactest/tests/provision022.py | 15 +++++++++++++++ 8 files changed, 48 insertions(+), 3 deletions(-) rename pactest/tests/{sync500.py => provision001.py} (100%) rename pactest/tests/{sync501.py => provision002.py} (100%) rename pactest/tests/{add043.py => provision010.py} (89%) rename pactest/tests/{add044.py => provision011.py} (90%) rename pactest/tests/{add045.py => provision012.py} (90%) create mode 100644 pactest/tests/provision020.py create mode 100644 pactest/tests/provision021.py create mode 100644 pactest/tests/provision022.py diff --git a/pactest/tests/sync500.py b/pactest/tests/provision001.py similarity index 100% rename from pactest/tests/sync500.py rename to pactest/tests/provision001.py diff --git a/pactest/tests/sync501.py b/pactest/tests/provision002.py similarity index 100% rename from pactest/tests/sync501.py rename to pactest/tests/provision002.py diff --git a/pactest/tests/add043.py b/pactest/tests/provision010.py similarity index 89% rename from pactest/tests/add043.py rename to pactest/tests/provision010.py index 18f732ee..711a7319 100644 --- a/pactest/tests/add043.py +++ b/pactest/tests/provision010.py @@ -8,7 +8,7 @@ lp = pmpkg("pkg2", "1.0-2") lp.provides = ["provision"] self.addpkg2db("local", lp) -self.args = "-A %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/add044.py b/pactest/tests/provision011.py similarity index 90% rename from pactest/tests/add044.py rename to pactest/tests/provision011.py index cbc82e9d..7fd5e6b4 100644 --- a/pactest/tests/add044.py +++ b/pactest/tests/provision011.py @@ -8,7 +8,7 @@ lp = pmpkg("pkg2", "1.0-2") lp.provides = ["provision 1.0-2"] self.addpkg2db("local", lp) -self.args = "-A %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/add045.py b/pactest/tests/provision012.py similarity index 90% rename from pactest/tests/add045.py rename to pactest/tests/provision012.py index b53e0906..11cdad4e 100644 --- a/pactest/tests/add045.py +++ b/pactest/tests/provision012.py @@ -8,7 +8,7 @@ lp = pmpkg("pkg2", "1.0-2") lp.provides = ["provision 1.0-1"] self.addpkg2db("local", lp) -self.args = "-A %s" % p.filename() +self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py new file mode 100644 index 00000000..7cb0a01b --- /dev/null +++ b/pactest/tests/provision020.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % p.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/provision021.py b/pactest/tests/provision021.py new file mode 100644 index 00000000..4b06a1a7 --- /dev/null +++ b/pactest/tests/provision021.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (2)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-2"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py new file mode 100644 index 00000000..d7f06913 --- /dev/null +++ b/pactest/tests/provision022.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (3)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-1"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % p.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2")