summaryrefslogtreecommitdiffstats
path: root/pactest/tests/sync893.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-02-23 07:50:42 +0100
committerDan McGee <dan@archlinux.org>2007-02-23 07:50:42 +0100
commitd9bd24c968436f05838614b9069ef4f29645b74a (patch)
tree6b3cfe527f1626f86a778a1f328f4eede93f5c2b /pactest/tests/sync893.py
parent2f32a02f9dae2f8a6a28af9da773c2ac9dc27f67 (diff)
downloadpacman-d9bd24c968436f05838614b9069ef4f29645b74a.tar.gz
pacman-d9bd24c968436f05838614b9069ef4f29645b74a.tar.xz
* Changes to quite a few of the tests, mostly minimal changes (better
descriptions, additional rules, etc) * One new pactest test regarding file migration between packages. * Fix of a little output bug in pmenv.py
Diffstat (limited to 'pactest/tests/sync893.py')
-rw-r--r--pactest/tests/sync893.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pactest/tests/sync893.py b/pactest/tests/sync893.py
index 7ab55383..9420b74c 100644
--- a/pactest/tests/sync893.py
+++ b/pactest/tests/sync893.py
@@ -1,4 +1,4 @@
-self.description = "conflict (bug)"
+self.description = "conflict 'db vs db'"
sp1 = pmpkg("pkg1", "1.0-2")
sp1.conflicts = ["pkg2"]
@@ -13,7 +13,7 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
self.addpkg2db("local", lp2)
-self.args = "-S pkg1 pkg2"
+self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")