simple pactest renaming : split conflict* into depconflict* and fileconflict*.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-28 13:39:12 +01:00 · 2007-10-28 13:39:12 +01:00 · 014306eb99
parent c50a7c6026
commit 014306eb99
6 changed files with 1 additions and 2 deletions
--- a/pactest/tests/depconflict100.py
+++ b/pactest/tests/depconflict100.py
--- a/pactest/tests/depconflict110.py
+++ b/pactest/tests/depconflict110.py
--- a/pactest/tests/depconflict111.py
+++ b/pactest/tests/depconflict111.py
@ -7,7 +7,7 @@
 lp = pmpkg("pkg2", "1.0-1")
 self.addpkg2db("local", lp)

-self.args = "-A %s" % p.filename() 
+self.args = "-A %s" % p.filename()
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")
 self.addrule("PKG_EXIST=pkg2")
--- a/pactest/tests/depconflict120.py
+++ b/pactest/tests/depconflict120.py
--- a/pactest/tests/fileconflict001.py
+++ b/pactest/tests/fileconflict001.py
--- a/pactest/tests/fileconflict002.py
+++ b/pactest/tests/fileconflict002.py
@ -14,4 +14,3 @@
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("!PKG_EXIST=pkg2")
-