Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/conflict001.py
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2007-10-28 13:39:12 +0100
committerDan McGee <dan@archlinux.org>2007-10-29 07:15:41 -0500
commit014306eb99c90c5c5c6d19d50aa47e29c25e8e14 (patch)
tree8411cbec14df85878a1c635d96d8d5f904755e8c /pactest/tests/conflict001.py
parentc50a7c6026e491771f0607d5e3fed737b3b5e8f3 (diff)
simple pactest renaming : split conflict* into depconflict* and fileconflict*.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest/tests/conflict001.py')
-rw-r--r--pactest/tests/conflict001.py19
1 files changed, 0 insertions, 19 deletions
diff --git a/pactest/tests/conflict001.py b/pactest/tests/conflict001.py
deleted file mode 100644
index a9f3f6b3..00000000
--- a/pactest/tests/conflict001.py
+++ /dev/null
@@ -1,19 +0,0 @@
-self.description = "target vs db conflict will disappear after upgrade"
-
-sp1 = pmpkg("pkg1")
-sp1.conflicts = ["imaginary"]
-self.addpkg2db("sync", sp1);
-
-sp2 = pmpkg("pkg2", "1.0-2")
-self.addpkg2db("sync", sp2)
-
-lp = pmpkg("pkg2", "1.0-1")
-lp.provides = ["imaginary"]
-self.addpkg2db("local", lp)
-
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_VERSION=pkg2|1.0-2")