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

pactest: remove PACMAN_OUTPUT from ldconfig tests

Browse Source 
This removes the last usages of this rule that aren't explicitly looking
at real output from pacman. Notably, these tests depended on one
particular debug logger not ever being changed, which is too fragile,
not to mention doesn't work at all with --nolog.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-29 13:30:03 -05:00
parent ad051f7328
commit c51b9ca0ad
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/pacman/ldconfig.stub Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
# A simple stub to copy into the chroot to fake ldconfig.
# Simply appends a line to /etc/ld.so.cache if called.
echo "ldconfig called" >> /etc/ld.so.cache

7
test/pacman/pmtest.py
View File

@ -119,13 +119,18 @@ class pmtest(object):
logdir = os.path.join(self.root, os.path.dirname(util.LOGFILE))
etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF))
bindir = os.path.join(self.root, "bin")
sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir]
sbindir = os.path.join(self.root, "sbin")
sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, sbindir]
for sys_dir in sys_dirs:
if not os.path.isdir(sys_dir):
vprint("\t%s" % sys_dir[len(self.root)+1:])
os.makedirs(sys_dir, 0755)
# Only the dynamically linked binary is needed for fakechroot
shutil.copy("/bin/sh", bindir)
shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"),
os.path.join(sbindir, "ldconfig"))
ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w")
ld_so_conf.close()
# Configuration file
vprint(" Creating configuration file")

9
test/pacman/tests/ldconfig001.py
View File

@ -1,12 +1,9 @@
# quick note here - chroot() is expected to fail. We're not checking the
# validity of the scripts, only that they fire (or try to)
self.description = "Make sure ldconfig runs on an add operation"
self.description = "Make sure ldconfig runs on an upgrade operation"
p = pmpkg("dummy")
self.addpkg(p)
# --debug is necessary to check PACMAN_OUTPUT
self.args = "--debug -U %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=running ldconfig")
self.addrule("FILE_EXIST=/etc/ld.so.cache")

7
test/pacman/tests/ldconfig002.py
View File

@ -1,5 +1,3 @@
# quick note here - chroot() is expected to fail. We're not checking the
# validity of the scripts, only that they fire (or try to)
self.description = "Make sure ldconfig runs on an upgrade operation"
lp = pmpkg("dummy")
@ -8,9 +6,8 @@ self.addpkg2db("local", lp)
p = pmpkg("dummy", "1.0-2")
self.addpkg(p)
# --debug is necessary to check PACMAN_OUTPUT
self.args = "--debug -U %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=dummy|1.0-2")
self.addrule("PACMAN_OUTPUT=running ldconfig")
self.addrule("FILE_EXIST=/etc/ld.so.cache")

7
test/pacman/tests/ldconfig003.py
View File

@ -1,5 +1,3 @@
# quick note here - chroot() is expected to fail. We're not checking the
# validity of the scripts, only that they fire (or try to)
self.description = "Make sure ldconfig runs on a sync operation"
sp = pmpkg("dummy")
@ -7,8 +5,5 @@ self.addpkg2db("sync", sp)
self.args = "-S %s" % sp.name
# --debug is necessary to check PACMAN_OUTPUT
self.args = "--debug -S %s" % sp.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=running ldconfig")
self.addrule("FILE_EXIST=/etc/ld.so.cache")

1
test/pacman/util.py
View File

@ -20,6 +20,7 @@ import os
import re
import hashlib
SELFPATH = os.path.abspath(os.path.dirname(__file__))
# ALPM
PM_ROOT = "/"