summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-769609-triggers-still-pending-after-run
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-09-01 00:53:40 +0200
committerJulian Andres Klode <jak@debian.org>2016-09-01 00:53:40 +0200
commit265c3312bd1b329dc9b54c754da46621d9019c11 (patch)
treee1c740747f84f793ee2b6ab4ffaffbc9f76cd575 /test/integration/test-bug-769609-triggers-still-pending-after-run
parent28f0867d99398a23296ead313112402c51d4e876 (diff)
parent317bb39f3cd6626c74f25d7bdf2907f1b235f553 (diff)
Merge tag '1.3_rc3' into ubuntu/master
apt Debian release 1.3~rc3
Diffstat (limited to 'test/integration/test-bug-769609-triggers-still-pending-after-run')
-rwxr-xr-xtest/integration/test-bug-769609-triggers-still-pending-after-run12
1 files changed, 6 insertions, 6 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..ce2c193dd 100755
--- a/test/integration/test-bug-769609-triggers-still-pending-after-run
+++ b/test/integration/test-bug-769609-triggers-still-pending-after-run
@@ -8,7 +8,7 @@ setupenvironment
configarchitecture 'amd64'
msgtest 'Check if installed dpkg supports' 'noawait trigger'
-if dpkg-checkbuilddeps -d 'dpkg (>= 1.16.1)' /dev/null; then
+if dpkg --compare-versions "$(dpkg_version)" 'ge' '1.16.1'; then
msgpass
else
msgskip 'dpkg version too old'
@@ -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'