diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-08-11 01:36:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-08-11 01:36:23 +0200 |
| commit | 0a7370ca91289db3d23d72aeac397edfe3dfb75b (patch) | |
| tree | a268cee713cb295851634d3a4a91c7283b564952 /test/integration/test-no-fds-leaked-to-maintainer-scripts | |
| parent | 6b3ddbd059c403efeb40d81c29f2cae6e8f5b1bf (diff) | |
| parent | 28557f94578602f9ce0011501a2259bd98ab0688 (diff) | |
Merge branch 'feature/apt-dpkg-comm'
Diffstat (limited to 'test/integration/test-no-fds-leaked-to-maintainer-scripts')
| -rwxr-xr-x | test/integration/test-no-fds-leaked-to-maintainer-scripts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts index 56cbff095..21b394055 100755 --- a/test/integration/test-no-fds-leaked-to-maintainer-scripts +++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts @@ -34,7 +34,7 @@ rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log testsuccess aptget install -y fdleaks -qq < /dev/null checkfdleak() { - msgtest 'Check if fds were not' 'leaked' + msgtest 'Check if fds were not' "leaked: expect $1" if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = "$1" ]; then msgpass else @@ -72,12 +72,15 @@ checkpurge() { tail -n +3 rootdir/var/log/apt/term.log | head -n -1 > terminal.log testfileequal 'terminal.log' "$(cat terminal.output)" - testequal "startup packages purge + testequal "startup packages remove status installed $PKGNAME 1.0 remove $PKGNAME 1.0 <none> status half-configured $PKGNAME 1.0 status half-installed $PKGNAME 1.0 status config-files $PKGNAME 1.0 +status config-files $PKGNAME 1.0 +startup packages purge +remove $PKGNAME 1.0 <none> purge $PKGNAME 1.0 <none> status config-files $PKGNAME 1.0 status config-files $PKGNAME 1.0 @@ -86,6 +89,7 @@ status config-files $PKGNAME 1.0 status config-files $PKGNAME 1.0 status not-installed $PKGNAME <none> startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log + testequalor2 "dpkg-query: no packages found matching ${PKGNAME}" "No packages found matching ${PKGNAME}." dpkg -l "$PKGNAME" } checkpurge |