Browse Source

test: Avoid use of /proc/self/fd

Use /dev/fd in test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch,
skip test-no-fds-leaked-to-maintainer-scripts (it is not guaranteed
that /dev/fd contains all file descriptors), and avoid the unneeded
use of /proc/fd in another test case.

Gbp-Dch: ignore
tags/debian/1.3_rc3
Julian Andres Klode 5 years ago
parent
commit
8683da6144
3 changed files with 11 additions and 6 deletions
  1. +1
    -1
      test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch
  2. +5
    -5
      test/integration/test-bug-769609-triggers-still-pending-after-run
  3. +5
    -0
      test/integration/test-no-fds-leaked-to-maintainer-scripts

+ 1
- 1
test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch View File

@@ -32,7 +32,7 @@ if [ -n \"${2}\" ]; then
FD=\$APT_HOOK_INFO_FD
if [ "\$FD" != \"${2}\" ]; then echo \"ERROR: Information is not on requested FD: \$FD != ${2}\" >> ${hook}-v${1}.list; fi
fi
while read </proc/\$\$/fd/\$FD line; do
while read </dev/fd/\$FD line; do
if echo \"\$line\" | grep -Fq '**'; then
echo \"\$line\"
fi


+ 5
- 5
test/integration/test-bug-769609-triggers-still-pending-after-run View File

@@ -23,7 +23,7 @@ buildtriggerpackages() {
cat >"${BUILDDIR}/debian/postinst" <<EOF
#!/bin/sh
if [ "\$1" = 'triggered' ]; then
ls -l /proc/self/fd/
echo "TRIGGER IS RUNNING"
fi
EOF
echo "$TYPE /usr/share/doc" > "${BUILDDIR}/debian/triggers"
@@ -49,26 +49,26 @@ runtests() {
testsuccess aptget install trigdepends-$TYPE -y --reinstall
cp rootdir/tmp/testsuccess.output terminal.output
testsuccess grep '^REWRITE ' terminal.output
testsuccess grep ' root root ' terminal.output
testsuccess grep 'TRIGGER IS RUNNING' terminal.output
testdpkginstalled triggerable-$TYPE trigdepends-$TYPE

testsuccess aptget install trigstuff -y
cp rootdir/tmp/testsuccess.output terminal.output
testsuccess grep '^REWRITE ' terminal.output
testsuccess grep ' root root ' terminal.output
testsuccess grep 'TRIGGER IS RUNNING' terminal.output
testdpkginstalled triggerable-$TYPE trigdepends-$TYPE trigstuff

testsuccess aptget purge trigstuff -y
cp rootdir/tmp/testsuccess.output terminal.output
testsuccess grep '^REWRITE ' terminal.output
testsuccess grep ' root root ' terminal.output
testsuccess grep 'TRIGGER IS RUNNING' terminal.output
testdpkginstalled triggerable-$TYPE trigdepends-$TYPE
testdpkgnotinstalled trigstuff

testsuccess aptget purge trigdepends-$TYPE -y
cp rootdir/tmp/testsuccess.output terminal.output
testfailure grep '^REWRITE ' terminal.output
testfailure grep ' root root ' terminal.output
testfailure grep 'TRIGGER IS RUNNING' terminal.output
testdpkgnotinstalled triggerable-$TYPE trigdepends-$TYPE
}
#runtests 'interest'


+ 5
- 0
test/integration/test-no-fds-leaked-to-maintainer-scripts View File

@@ -8,6 +8,11 @@ setupenvironment
configarchitecture 'amd64' 'i386'
configdpkgnoopchroot

if [ ! -e /proc/self/fd ]; then
msgskip "needs /proc/self/fd"
exit 0
fi

setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
BUILDDIR="incoming/fdleaks-1.0"
for script in 'preinst' 'postinst' 'prerm' 'postrm'; do


Loading…
Cancel
Save