summaryrefslogtreecommitdiff
path: root/pactest
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-07-17 15:48:57 +0200
committerDan McGee <dan@archlinux.org>2009-07-20 10:13:25 -0500
commitbfd6817112b34b552e9139bdc582d048bcba38b9 (patch)
tree1c33649fec71af2d5a16618bd9627689c0a54285 /pactest
parenta3ecbec6b584b3595c041850e4c8bf242f7ce74a (diff)
Fix fileconflict004
When one package wants to replace a directory by a file, we check that all files in that directory were owned by that package. Additionally pacman can be more verbose when the extraction of the symlink (or file) fails. The patch to add.c looks more complex than it is, I just moved and reindented code to handle cases 10 and 11 together. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
-rw-r--r--pactest/tests/fileconflict004.py2
-rw-r--r--pactest/tests/fileconflict005.py1
-rw-r--r--pactest/tests/fileconflict006.py24
3 files changed, 24 insertions, 3 deletions
diff --git a/pactest/tests/fileconflict004.py b/pactest/tests/fileconflict004.py
index 2396cedb..a5347ccd 100644
--- a/pactest/tests/fileconflict004.py
+++ b/pactest/tests/fileconflict004.py
@@ -17,5 +17,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_VERSION=pkg1|2.0-1")
self.addrule("FILE_TYPE=test|link")
-
-self.expectfailure = True
diff --git a/pactest/tests/fileconflict005.py b/pactest/tests/fileconflict005.py
index b9c0fa90..5c554afe 100644
--- a/pactest/tests/fileconflict005.py
+++ b/pactest/tests/fileconflict005.py
@@ -20,4 +20,3 @@ self.args = "-S pkg1"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
-
diff --git a/pactest/tests/fileconflict006.py b/pactest/tests/fileconflict006.py
new file mode 100644
index 00000000..84afff2d
--- /dev/null
+++ b/pactest/tests/fileconflict006.py
@@ -0,0 +1,24 @@
+self.description = "dir->symlink change during package upgrade (conflict)"
+
+p1 = pmpkg("pkg1", "1.0-1")
+p1.files = ["test/",
+ "test/file1",
+ "test/dir/file1",
+ "test/dir/file2"]
+self.addpkg2db("local", p1)
+
+p2 = pmpkg("pkg2")
+p2.files = ["test/dir/file3"]
+self.addpkg2db("local", p2)
+
+p3 = pmpkg("pkg1", "2.0-1")
+p3.files = ["test2/",
+ "test2/file3",
+ "test -> test2"]
+self.addpkg2db("sync", p3)
+
+self.args = "-S pkg1"
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_EXIST=pkg1")
+self.addrule("PKG_VERSION=pkg1|1.0-1")