moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Rework fakechroot checking

Browse Source 
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>
This commit is contained in:
Dan McGee 2008-08-31 18:38:23 -05:00
parent ce3d70aa99
commit 927ce2b7a5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pactest/pmtest.py
View File

@ -197,9 +197,7 @@ class pmtest:
cmd.append("fakeroot") cmd.append("fakeroot")
fakechroot = which("fakechroot") fakechroot = which("fakechroot")
if not fakechroot: if fakechroot:
print "WARNING: fakechroot not found, scriptlet tests WILL fail!!!"
else:
cmd.append("fakechroot") cmd.append("fakechroot")
if pacman["gdb"]: if pacman["gdb"]:

4
pactest/tests/scriptlet001.py
View File

@ -14,3 +14,7 @@ self.args = "--debug -U %s" % p1.filename()
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + pre)
self.addrule("PACMAN_OUTPUT=" + post) self.addrule("PACMAN_OUTPUT=" + post)
fakechroot = which("fakechroot")
if not fakechroot:
self.expectfailure = True

4
pactest/tests/scriptlet002.py
View File

@ -14,3 +14,7 @@ self.args = "--debug -R %s" % p1.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + pre)
self.addrule("PACMAN_OUTPUT=" + post) self.addrule("PACMAN_OUTPUT=" + post)
fakechroot = which("fakechroot")
if not fakechroot:
self.expectfailure = True