diff options
| author | Bryan Ischo <bryan@ischo.com> | 2009-02-22 11:25:31 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-02-24 03:33:56 +0100 |
| commit | 02685504012a4880e599b15f1060f6bd0bf48797 (patch) | |
| tree | 0d227fbfa8a2c58a7e23e6d23365e4b802e2e637 /pactest | |
| parent | c8a41b7d6da7f820754a07cb085687ea5e110f85 (diff) | |
| download | pacman-02685504012a4880e599b15f1060f6bd0bf48797.tar.gz pacman-02685504012a4880e599b15f1060f6bd0bf48797.tar.xz | |
Enabled new interactive prompt and updated some tests
Enabled a new prompt to ask the user if they'd like to remove
unresolvable packages from the transaction rather than failing it.
Many pactest tests that used to fail now return success codes, because
pacman now issues a prompt allowing the user to cancel rather than
failing many transactions, and the pactest scripts always choose to
cancel with no error rather than failing. The only net effect is that
the return status of pacman is now 0 in cases where it used to be
nonzero.
Signed-off-by: Bryan Ischo <bryan@ischo.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
| -rw-r--r-- | pactest/tests/provision020.py | 2 | ||||
| -rw-r--r-- | pactest/tests/provision022.py | 2 | ||||
| -rw-r--r-- | pactest/tests/sync1008.py | 2 | ||||
| -rw-r--r-- | pactest/tests/sync300.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py index 7cb0a01b..c9c0ac36 100644 --- a/pactest/tests/provision020.py +++ b/pactest/tests/provision020.py @@ -10,6 +10,6 @@ self.addpkg2db("local", lp) self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +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 index 4883d428..190a8b66 100644 --- a/pactest/tests/provision022.py +++ b/pactest/tests/provision022.py @@ -10,6 +10,6 @@ self.addpkg2db("local", lp) self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/sync1008.py b/pactest/tests/sync1008.py index a6064597..90c61dfb 100644 --- a/pactest/tests/sync1008.py +++ b/pactest/tests/sync1008.py @@ -14,6 +14,6 @@ self.addpkg2db("sync1", sp3) self.args = "-S pkg" -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg") self.addrule("!PKG_EXIST=cpkg") diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py index 31b520a8..36d6758a 100644 --- a/pactest/tests/sync300.py +++ b/pactest/tests/sync300.py @@ -9,6 +9,6 @@ self.addpkg2db("sync", sp2) self.args = "-S %s" % sp1.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") |