summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2008-01-14 20:02:01 +0100
committerDan McGee <dan@archlinux.org>2008-01-14 21:43:30 -0600
commit1dca8b630937450ba66351f53c5ce3e59f14732c (patch)
tree2da52efcb29ef0162bfd388788f3ff3cf97e8e11
parent223a0ce89d0abbf3a0e4a33c1a96c2e9cbd096cc (diff)
downloadpacman-1dca8b630937450ba66351f53c5ce3e59f14732c.tar.xz
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 <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--pactest/tests/provision001.py (renamed from pactest/tests/sync500.py)0
-rw-r--r--pactest/tests/provision002.py (renamed from pactest/tests/sync501.py)0
-rw-r--r--pactest/tests/provision010.py (renamed from pactest/tests/add043.py)2
-rw-r--r--pactest/tests/provision011.py (renamed from pactest/tests/add044.py)2
-rw-r--r--pactest/tests/provision012.py (renamed from pactest/tests/add045.py)2
-rw-r--r--pactest/tests/provision020.py15
-rw-r--r--pactest/tests/provision021.py15
-rw-r--r--pactest/tests/provision022.py15
8 files changed, 48 insertions, 3 deletions
diff --git a/pactest/tests/sync500.py b/pactest/tests/provision001.py
index 36364c16..36364c16 100644
--- a/pactest/tests/sync500.py
+++ b/pactest/tests/provision001.py
diff --git a/pactest/tests/sync501.py b/pactest/tests/provision002.py
index fa5f3688..fa5f3688 100644
--- a/pactest/tests/sync501.py
+++ b/pactest/tests/provision002.py
diff --git a/pactest/tests/add043.py b/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
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
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")