diff options
| author | Dan McGee <dan@archlinux.org> | 2008-10-13 04:36:45 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-10-13 04:36:45 +0200 |
| commit | fa02a71abd62fc8b45e92ce1652b5d98174a6dca (patch) | |
| tree | 44880adf216b6a634e90e76428b265e02df33b58 /pactest | |
| parent | 91a013a8791b73daf4d17b2d52c8dfaf12887cc6 (diff) | |
| parent | 30851a24ff68b00898565a1144926d83c623e6bf (diff) | |
| download | pacman-fa02a71abd62fc8b45e92ce1652b5d98174a6dca.tar.gz pacman-fa02a71abd62fc8b45e92ce1652b5d98174a6dca.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'pactest')
| -rwxr-xr-x | pactest/pmtest.py | 4 | ||||
| -rw-r--r-- | pactest/tests/scriptlet001.py | 4 | ||||
| -rw-r--r-- | pactest/tests/scriptlet002.py | 4 |
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 |