FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 07-11-2012, 12:32 PM
Allan McRae
 
Default Add pactest for empty subdirectory conflict

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>
---

Oops!

test/pacman/tests/fileconflict011.py | 17 +++++++++++++++++
test/pacman/tests/fileconflict012.py | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 test/pacman/tests/fileconflict011.py

diff --git a/test/pacman/tests/fileconflict011.py b/test/pacman/tests/fileconflict011.py
new file mode 100644
index 0000000..af48a06
--- /dev/null
+++ b/test/pacman/tests/fileconflict011.py
@@ -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/")
diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
index 421b739..95ab568 100644
--- a/test/pacman/tests/fileconflict012.py
+++ b/test/pacman/tests/fileconflict012.py
@@ -14,4 +14,4 @@

self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
-self.addrule("DIR_EXIST=dir/")
+self.addrule("FILE_EXIST=dir/file")
--
1.7.11.1
 

Thread Tools




All times are GMT. The time now is 10:41 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org