summaryrefslogtreecommitdiff
path: root/pactest
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2007-10-28 13:39:12 +0100
committerDan McGee <dan@archlinux.org>2007-10-29 07:15:41 -0500
commit014306eb99c90c5c5c6d19d50aa47e29c25e8e14 (patch)
tree8411cbec14df85878a1c635d96d8d5f904755e8c /pactest
parentc50a7c6026e491771f0607d5e3fed737b3b5e8f3 (diff)
downloadpacman-014306eb99c90c5c5c6d19d50aa47e29c25e8e14.tar.xz
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>
Diffstat (limited to 'pactest')
-rw-r--r--pactest/tests/depconflict100.py (renamed from pactest/tests/conflict004.py)0
-rw-r--r--pactest/tests/depconflict110.py (renamed from pactest/tests/conflict002.py)0
-rw-r--r--pactest/tests/depconflict111.py (renamed from pactest/tests/conflict003.py)2
-rw-r--r--pactest/tests/depconflict120.py (renamed from pactest/tests/conflict001.py)0
-rw-r--r--pactest/tests/fileconflict001.py (renamed from pactest/tests/conflict005.py)0
-rw-r--r--pactest/tests/fileconflict002.py (renamed from pactest/tests/conflict006.py)1
6 files changed, 1 insertions, 2 deletions
diff --git a/pactest/tests/conflict004.py b/pactest/tests/depconflict100.py
index 948017d9..948017d9 100644
--- a/pactest/tests/conflict004.py
+++ b/pactest/tests/depconflict100.py
diff --git a/pactest/tests/conflict002.py b/pactest/tests/depconflict110.py
index 2e326f52..2e326f52 100644
--- a/pactest/tests/conflict002.py
+++ b/pactest/tests/depconflict110.py
diff --git a/pactest/tests/conflict003.py b/pactest/tests/depconflict111.py
index 7205086a..6f95733b 100644
--- a/pactest/tests/conflict003.py
+++ b/pactest/tests/depconflict111.py
@@ -7,7 +7,7 @@ self.addpkg(p);
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")
diff --git a/pactest/tests/conflict001.py b/pactest/tests/depconflict120.py
index a9f3f6b3..a9f3f6b3 100644
--- a/pactest/tests/conflict001.py
+++ b/pactest/tests/depconflict120.py
diff --git a/pactest/tests/conflict005.py b/pactest/tests/fileconflict001.py
index 8aca9a0a..8aca9a0a 100644
--- a/pactest/tests/conflict005.py
+++ b/pactest/tests/fileconflict001.py
diff --git a/pactest/tests/conflict006.py b/pactest/tests/fileconflict002.py
index 43899f04..da04e332 100644
--- a/pactest/tests/conflict006.py
+++ b/pactest/tests/fileconflict002.py
@@ -14,4 +14,3 @@ 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")
-