summaryrefslogtreecommitdiffstats
path: root/pactest
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-08-31 18:38:23 -0500
committerDan McGee <dan@archlinux.org>2008-10-12 21:29:04 -0500
commit927ce2b7a52360507da3d81804520dbba4a9700d (patch)
treeb9fcadf4d60f3c7b6659eaa8de58e8eac9916fee /pactest
parentce3d70aa99ab86d49756d1858580750f2f13dd9e (diff)
downloadpacman-927ce2b7a52360507da3d81804520dbba4a9700d.tar.xz
Rework fakechroot checking
Do the checks in the tests that need it, and get rid of some of the cluttered output when it is not available (one line per test run). Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
-rwxr-xr-xpactest/pmtest.py4
-rw-r--r--pactest/tests/scriptlet001.py4
-rw-r--r--pactest/tests/scriptlet002.py4
3 files changed, 9 insertions, 3 deletions
diff --git a/pactest/pmtest.py b/pactest/pmtest.py
index 39f4deab..7bb32812 100755
--- a/pactest/pmtest.py
+++ b/pactest/pmtest.py
@@ -197,9 +197,7 @@ class pmtest:
cmd.append("fakeroot")
fakechroot = which("fakechroot")
- if not fakechroot:
- print "WARNING: fakechroot not found, scriptlet tests WILL fail!!!"
- else:
+ if fakechroot:
cmd.append("fakechroot")
if pacman["gdb"]:
diff --git a/pactest/tests/scriptlet001.py b/pactest/tests/scriptlet001.py
index 54a46aae..ff7fcd20 100644
--- a/pactest/tests/scriptlet001.py
+++ b/pactest/tests/scriptlet001.py
@@ -14,3 +14,7 @@ self.args = "--debug -U %s" % p1.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=" + pre)
self.addrule("PACMAN_OUTPUT=" + post)
+
+fakechroot = which("fakechroot")
+if not fakechroot:
+ self.expectfailure = True
diff --git a/pactest/tests/scriptlet002.py b/pactest/tests/scriptlet002.py
index dd792b82..cc316a10 100644
--- a/pactest/tests/scriptlet002.py
+++ b/pactest/tests/scriptlet002.py
@@ -14,3 +14,7 @@ self.args = "--debug -R %s" % p1.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=" + pre)
self.addrule("PACMAN_OUTPUT=" + post)
+
+fakechroot = which("fakechroot")
+if not fakechroot:
+ self.expectfailure = True