diff options
author | Julian Andres Klode <jak@debian.org> | 2016-08-24 00:25:26 +0200 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2016-08-26 22:17:55 +0200 |
commit | 8683da61448b62df2ccc1918e4c605c9e6d4ab1d (patch) | |
tree | 3888a7d44f124ed2bc120b5c490e12e07df0728f /test/integration/test-bug-769609-triggers-still-pending-after-run | |
parent | f8e8a14f17cb41c588970fc57bb41fcf6058a703 (diff) |
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
Diffstat (limited to 'test/integration/test-bug-769609-triggers-still-pending-after-run')
-rwxr-xr-x | test/integration/test-bug-769609-triggers-still-pending-after-run | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-bug-769609-triggers-still-pending-after-run b/test/integration/test-bug-769609-triggers-still-pending-after-run index bd43578a5..b44ebf74f 100755 --- a/test/integration/test-bug-769609-triggers-still-pending-after-run +++ b/test/integration/test-bug-769609-triggers-still-pending-after-run @@ -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' |