diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-16 15:38:02 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-07-03 13:44:45 -0500 |
| commit | a2995f586e492e0d2cb85e7e9ebb5f3857891465 (patch) | |
| tree | 1c7234cabaa1f36a80364ca1e6e6e2f69fc3c50a | |
| parent | 06840f14b465d9db53646ab0cbc2d4b3526bd255 (diff) | |
| download | pacman-a2995f586e492e0d2cb85e7e9ebb5f3857891465.tar.xz | |
pactest: add a few more checks to fileconflict checks
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | test/pacman/tests/fileconflict001.py | 3 | ||||
| -rw-r--r-- | test/pacman/tests/fileconflict002.py | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index 8c13911c..dec61512 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -2,6 +2,7 @@ self.description = "Fileconflict with symlinks" lp = pmpkg("dummy") lp.files = ["dir/realdir/", + "dir/realdir/realfile", "dir/symdir -> realdir"] self.addpkg2db("local", lp) @@ -18,5 +19,7 @@ self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("FILE_EXIST=dir/realdir/realfile") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py index f70873ba..e107cd2e 100644 --- a/test/pacman/tests/fileconflict002.py +++ b/test/pacman/tests/fileconflict002.py @@ -1,12 +1,16 @@ self.description = "Fileconflict with symlinks (2)" p1 = pmpkg("pkg1") -p1.files = ["dir/realdir/file", +p1.files = ["dir/", + "dir/realdir/", + "dir/realdir/file", "dir/symdir -> realdir"] self.addpkg(p1) p2 = pmpkg("pkg2") -p2.files = ["dir/symdir/file"] +p2.files = ["dir/", + "dir/symdir/", + "dir/symdir/file"] self.addpkg(p2) self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) @@ -14,5 +18,6 @@ self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True |