From: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org> --- test/pacman/tests/fileconflict020.py | 20 ++++++++++++++++++++ test/pacman/tests/fileconflict021.py | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 test/pacman/tests/fileconflict020.py create mode 100644 test/pacman/tests/fileconflict021.py diff --git a/test/pacman/tests/fileconflict020.py b/test/pacman/tests/fileconflict020.py new file mode 100644 index 0000000..306aca2 --- /dev/null +++ b/test/pacman/tests/fileconflict020.py @@ -0,0 +1,20 @@ +self.description = "upgrade introduces new directory that conflicts with a package file" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/bin/foo"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-2") +p.files = ["usr/bin/foo/"] +self.addpkg2db("sync", p) + +self.args = "-S pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg2|1.0-1") +self.addrule("!DIR_EXIST=usr/bin/foo/") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict021.py b/test/pacman/tests/fileconflict021.py new file mode 100644 index 0000000..ccb70f2 --- /dev/null +++ b/test/pacman/tests/fileconflict021.py @@ -0,0 +1,18 @@ +self.description = "upgrade package overwriting existing unowned file with directory" + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +self.filesystem = ["file"] + +p = pmpkg("pkg1", "1.0-2") +p.files = ["file/"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("!DIR_EXIST=file/") + +self.expectfailure = True -- 1.8.0.1