summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-08 23:52:52 -0500
committerDan McGee <dan@archlinux.org>2011-08-09 15:46:11 -0500
commit5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd (patch)
tree30585f0755c893efe7600848c5e6f2565e0506c4 /test
parent96c4b1c3033e4f018ab20af5d35cf9cbd8b31cf4 (diff)
downloadpacman-5a6ebec7b27e0ec15c2fe79b394f9f65aecc33cd.tar.xz
Add a slightly simpler versioned replace test
It turns out we have a few problems here which are best tackled independently. The first is simply parsing replacements as dep strings; the second will be dealing with replaces when the original package name still exists in the repository. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/replace101.py7
-rw-r--r--test/pacman/tests/replace102.py38
-rw-r--r--test/pacman/tests/replace110.py27
3 files changed, 46 insertions, 26 deletions
diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace101.py
index 86c40ac6..ee0f8607 100644
--- a/test/pacman/tests/replace101.py
+++ b/test/pacman/tests/replace101.py
@@ -1,4 +1,4 @@
-self.description = "Sysupgrade with a versioned replacement"
+self.description = "Sysupgrade with a versioned replacement, original disappears"
sp1 = pmpkg("python2-yaml", "5-1")
sp1.replaces = ["python-yaml<5"]
@@ -6,11 +6,6 @@ sp1.conflicts = ["python-yaml<5"]
sp1.files = ["lib/python2/file"]
self.addpkg2db("sync", sp1)
-# the python3 version
-sp2 = pmpkg("python-yaml", "5-1")
-sp2.files = ["lib/python3/file"]
-self.addpkg2db("sync", sp2)
-
lp1 = pmpkg("python-yaml", "4-1")
lp1.files = ["lib/python2/file"]
self.addpkg2db("local", lp1)
diff --git a/test/pacman/tests/replace102.py b/test/pacman/tests/replace102.py
index c6e2e5f0..ca05d4e6 100644
--- a/test/pacman/tests/replace102.py
+++ b/test/pacman/tests/replace102.py
@@ -1,27 +1,25 @@
-self.description = "Replace a package with a file in 'backup' (local modified)"
-# FS#24543
+self.description = "Sysupgrade with a versioned replacement, original stays"
-lp = pmpkg("dummy")
-lp.files = ["etc/dummy.conf*", "bin/dummy"]
-lp.backup = ["etc/dummy.conf"]
-self.addpkg2db("local", lp)
+sp1 = pmpkg("python2-yaml", "5-1")
+sp1.replaces = ["python-yaml<5"]
+sp1.conflicts = ["python-yaml<5"]
+sp1.files = ["lib/python2/file"]
+self.addpkg2db("sync", sp1)
-sp = pmpkg("replacement")
-sp.replaces = ["dummy"]
-sp.files = ["etc/dummy.conf", "bin/dummy*"]
-sp.backup = ["etc/dummy.conf"]
-self.addpkg2db("sync", sp)
+# the python3 version
+sp2 = pmpkg("python-yaml", "5-1")
+sp2.files = ["lib/python3/file"]
+self.addpkg2db("sync", sp2)
-self.args = "-Su"
-
-self.addrule("!PKG_EXIST=dummy")
-self.addrule("PKG_EXIST=replacement")
+lp1 = pmpkg("python-yaml", "4-1")
+lp1.files = ["lib/python2/file"]
+self.addpkg2db("local", lp1)
-self.addrule("FILE_EXIST=etc/dummy.conf")
-self.addrule("!FILE_MODIFIED=etc/dummy.conf")
-self.addrule("!FILE_PACNEW=etc/dummy.conf")
-self.addrule("!FILE_PACSAVE=etc/dummy.conf")
+self.args = "-Su"
-self.addrule("FILE_EXIST=bin/dummy")
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=python-yaml")
+self.addrule("PKG_VERSION=python2-yaml|5-1")
+self.addrule("FILE_EXIST=lib/python2/file")
self.expectfailure = True
diff --git a/test/pacman/tests/replace110.py b/test/pacman/tests/replace110.py
new file mode 100644
index 00000000..c6e2e5f0
--- /dev/null
+++ b/test/pacman/tests/replace110.py
@@ -0,0 +1,27 @@
+self.description = "Replace a package with a file in 'backup' (local modified)"
+# FS#24543
+
+lp = pmpkg("dummy")
+lp.files = ["etc/dummy.conf*", "bin/dummy"]
+lp.backup = ["etc/dummy.conf"]
+self.addpkg2db("local", lp)
+
+sp = pmpkg("replacement")
+sp.replaces = ["dummy"]
+sp.files = ["etc/dummy.conf", "bin/dummy*"]
+sp.backup = ["etc/dummy.conf"]
+self.addpkg2db("sync", sp)
+
+self.args = "-Su"
+
+self.addrule("!PKG_EXIST=dummy")
+self.addrule("PKG_EXIST=replacement")
+
+self.addrule("FILE_EXIST=etc/dummy.conf")
+self.addrule("!FILE_MODIFIED=etc/dummy.conf")
+self.addrule("!FILE_PACNEW=etc/dummy.conf")
+self.addrule("!FILE_PACSAVE=etc/dummy.conf")
+
+self.addrule("FILE_EXIST=bin/dummy")
+
+self.expectfailure = True