[pacman-dev] [PATCH] New fileconflict005.py pactest

[Nagy Gabor]

From 13c0673aa16f71c58ec5665c5832bb44717d08d7 Mon Sep 17 00:00:00 2001
From: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Fri, 25 Jul 2008 14:35:54 +0200
Subject: [PATCH] New fileconflict005.py pactest

This makes the fileconflict004.py test complete.

Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
---
 pactest/tests/fileconflict005.py |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 pactest/tests/fileconflict005.py

diff --git a/pactest/tests/fileconflict005.py b/pactest/tests/fileconflict005.py
new file mode 100644
index 0000000..b9c0fa9
--- /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")
+
-- 
1.5.6.4