diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2008-02-09 17:51:05 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-11 20:40:43 -0600 |
| commit | 7586072beb8fde6631fe43a2eee5ca76255055d0 (patch) | |
| tree | 2e67d24fdc89a11e36b849a8efd689fdbc5c6e52 | |
| parent | 17180890a58365d717a8f79d2e60f5af4f829eef (diff) | |
| download | pacman-7586072beb8fde6631fe43a2eee5ca76255055d0.tar.xz | |
Fixes file relocation pactests
This patch fixes upgrade040.py and upgrade041.py (041 now fails!):
* the old pactests didn't check the existence of the relocated file
* upgrade041.py was broken due to a typo (missing comma)
New upgrade046.py pactest was added (derived from the fixed upgrade041.py).
This fails because the file relocation check is _hacked_ to conflict.c, and
_alpm_db_find_fileconflicts is not called in case of --force.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
| -rw-r--r-- | pactest/tests/upgrade040.py | 1 | ||||
| -rw-r--r-- | pactest/tests/upgrade041.py | 3 | ||||
| -rw-r--r-- | pactest/tests/upgrade046.py | 31 |
3 files changed, 34 insertions, 1 deletions
diff --git a/pactest/tests/upgrade040.py b/pactest/tests/upgrade040.py index bc40f337..e17c7176 100644 --- a/pactest/tests/upgrade040.py +++ b/pactest/tests/upgrade040.py @@ -27,4 +27,5 @@ for p in p1, p2: self.addrule("PKG_EXIST=%s" % p.name) self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") diff --git a/pactest/tests/upgrade041.py b/pactest/tests/upgrade041.py index 347c2c4b..20da4f14 100644 --- a/pactest/tests/upgrade041.py +++ b/pactest/tests/upgrade041.py @@ -4,7 +4,7 @@ lp1 = pmpkg("dummy") lp1.files = ["bin/dummy"] lp2 = pmpkg("foobar") -lp2.files = ["bin/foobar" +lp2.files = ["bin/foobar", "usr/share/file"] for p in lp1, lp2: @@ -27,4 +27,5 @@ for p in p1, p2: self.addrule("PKG_EXIST=%s" % p.name) self.addrule("FILE_MODIFIED=bin/dummy") self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") diff --git a/pactest/tests/upgrade046.py b/pactest/tests/upgrade046.py new file mode 100644 index 00000000..60164b72 --- /dev/null +++ b/pactest/tests/upgrade046.py @@ -0,0 +1,31 @@ +self.description = "File relocation between two packages (reverse order, --force)" + +lp1 = pmpkg("dummy") +lp1.files = ["bin/dummy"] + +lp2 = pmpkg("foobar") +lp2.files = ["bin/foobar", + "usr/share/file"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy", + "usr/share/file"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +for p in p1, p2: + self.addrule("PKG_EXIST=%s" % p.name) +self.addrule("FILE_MODIFIED=bin/dummy") +self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_EXIST=usr/share/file") +self.addrule("FILE_MODIFIED=usr/share/file") |