summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-07-25 14:35:54 +0200
committerDan McGee <dan@archlinux.org>2008-07-29 21:46:36 -0500
commite4b1a97ff232a8f755cc2db845683b940ad543b4 (patch)
tree809e6d18fb7c96adf23bd51de1fdfa4ad499a363
parent85f5279ec04f80ed6dde9c6a13272b7d3bb1e80d (diff)
New fileconflict005.py pactest
This makes the fileconflict004.py test complete. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--pactest/tests/fileconflict005.py23
1 files changed, 23 insertions, 0 deletions
diff --git a/pactest/tests/fileconflict005.py b/pactest/tests/fileconflict005.py
new file mode 100644
index 00000000..b9c0fa90
--- /dev/null
+++ b/pactest/tests/fileconflict005.py
@@ -0,0 +1,23 @@
+self.description = "dir->symlink change during package upgrade (conflict)"
+
+p1 = pmpkg("pkg1", "1.0-1")
+p1.files = ["test/",
+ "test/file1"]
+self.addpkg2db("local", p1)
+
+p2 = pmpkg("pkg2")
+p2.files = ["test/file2"]
+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")
+