diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-05-10 22:26:19 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-03 05:33:47 +0200 |
| commit | c91d9484868f35e17dccc447d8c29cbb7978fb4f (patch) | |
| tree | 97eefe60a2c4df9f2706d1d5dc0ae67327d2be5d /test | |
| parent | 0b3d04719db189ad7dbc8b36b5f34d95a5c63646 (diff) | |
| download | pacman-c91d9484868f35e17dccc447d8c29cbb7978fb4f.tar.gz pacman-c91d9484868f35e17dccc447d8c29cbb7978fb4f.tar.xz | |
conflict.c: check for file -> dir replacements
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/fileconflict007.py | 2 | ||||
| -rw-r--r-- | test/pacman/tests/symlink020.py | 20 |
2 files changed, 20 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py index b61ddb42..7fe65ed4 100644 --- a/test/pacman/tests/fileconflict007.py +++ b/test/pacman/tests/fileconflict007.py @@ -16,5 +16,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg") self.addrule("PKG_VERSION=pkg|1.0-2") self.addrule("FILE_TYPE=dir/symdir/|dir") - -self.expectfailure = True diff --git a/test/pacman/tests/symlink020.py b/test/pacman/tests/symlink020.py new file mode 100644 index 00000000..343add2d --- /dev/null +++ b/test/pacman/tests/symlink020.py @@ -0,0 +1,20 @@ +self.description = "symlink -> dir replacment" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/lib/foo", + "lib -> usr/lib/"] +self.addpkg2db("local", lp1) + +lp1 = pmpkg("pkg2") +lp1.files = ["usr/lib/bar"] +self.addpkg2db("local", lp1) + +sp = pmpkg("pkg1", "1.0-2") +sp.files = ["lib/bar"] +self.addpkg2db("sync", sp) + +self.args = "-S %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_TYPE=lib|dir") +self.addrule("FILE_TYPE=lib/bar|file") |