diff options
author | Dan McGee <dan@archlinux.org> | 2007-02-23 07:50:42 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2007-02-23 07:50:42 +0100 |
commit | d9bd24c968436f05838614b9069ef4f29645b74a (patch) | |
tree | 6b3cfe527f1626f86a778a1f328f4eede93f5c2b /pactest/tests/sync043.py | |
parent | 2f32a02f9dae2f8a6a28af9da773c2ac9dc27f67 (diff) | |
download | pacman-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/sync043.py')
-rw-r--r-- | pactest/tests/sync043.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pactest/tests/sync043.py b/pactest/tests/sync043.py index 200626d3..1302bf04 100644 --- a/pactest/tests/sync043.py +++ b/pactest/tests/sync043.py @@ -1,14 +1,18 @@ -self.description = "Install a sync package conflicting with a local one" +self.description = "Install a sync package conflicting with two local ones" sp = pmpkg("pkg1") -sp.conflicts = ["pkg2"] +sp.conflicts = ["pkg2", "pkg3"] self.addpkg2db("sync", sp); -lp = pmpkg("pkg2") -self.addpkg2db("local", lp); +lp1 = pmpkg("pkg2") +self.addpkg2db("local", lp1); -self.args = "-S pkg1" +lp1 = pmpkg("pkg3") +self.addpkg2db("local", lp1); + +self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") |