From 014306eb99c90c5c5c6d19d50aa47e29c25e8e14 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 28 Oct 2007 13:39:12 +0100 Subject: simple pactest renaming : split conflict* into depconflict* and fileconflict*. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- pactest/tests/conflict006.py | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 pactest/tests/conflict006.py (limited to 'pactest/tests/conflict006.py') diff --git a/pactest/tests/conflict006.py b/pactest/tests/conflict006.py deleted file mode 100644 index 43899f04..00000000 --- a/pactest/tests/conflict006.py +++ /dev/null @@ -1,17 +0,0 @@ -self.description = "Fileconflict with symlinks (2)" - -p1 = pmpkg("pkg1") -p1.files = ["dir/realdir/file", - "dir/symdir -> realdir"] -self.addpkg(p1) - -p2 = pmpkg("pkg2") -p2.files = ["dir/symdir/file"] -self.addpkg(p2) - -self.args = "-A %s" % " ".join([p.filename() for p in p1, p2]) - -self.addrule("PACMAN_RETCODE=1") -self.addrule("!PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") - -- cgit v1.2.3-70-g09d2