moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-05 00:55:04 -05:00
Code Issues Releases Wiki Activity

Add pactest for empty subdirectory conflict

Browse Source 
The wrong test file was inadvertantly committed in 44e9fdd0. Add the
correct test and tidy up the test which was committed.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2012-07-11 11:36:36 +10:00 committed by Dan McGee
parent 49dbebcc36
commit e3772f7654
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/pacman/tests/fileconflict011.py Normal file
View File

@ -0,0 +1,17 @@
self.description = "dir->file change during package upgrade (filesystem directory conflict)"
lp1 = pmpkg("pkg1")
lp1.files = ["dir/"]
self.addpkg2db("local", lp1)
self.filesystem = ["dir/conflict/"]
p = pmpkg("pkg1", "1.0-2")
p.files = ["dir"]
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=dir/conflict/")

2
test/pacman/tests/fileconflict012.py
View File

@ -14,4 +14,4 @@ self.args = "-S pkg1"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
self.addrule("DIR_EXIST=dir/")
self.addrule("FILE_EXIST=dir/file")