diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-24 23:00:57 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-24 23:00:57 +0100 |
| commit | 34f7c486b10559997849c15c6b51577ec3f96bc1 (patch) | |
| tree | 84a6a8c8a4c02c5d9b7d9fe1d52472c5e6eb7dec /test/integration/test-apt-progress-fd-conffile | |
| parent | 1aef66d5e150c608276fabdf1c2d2aaca9c45b7f (diff) | |
| parent | 2fd754cfe9a92fe85f4dd56447c70112b64b003e (diff) | |
Merge remote-tracking branch 'ajt/better-pdiffs-dk' into debian/sid
Diffstat (limited to 'test/integration/test-apt-progress-fd-conffile')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-conffile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/test/integration/test-apt-progress-fd-conffile b/test/integration/test-apt-progress-fd-conffile index 0b42b1b2f..085d5e871 100755 --- a/test/integration/test-apt-progress-fd-conffile +++ b/test/integration/test-apt-progress-fd-conffile @@ -32,12 +32,19 @@ testsuccess aptget install compiz-core=1.0 # fake conffile change echo "meep" >> rootdir/etc/compiz.conf/compiz.conf -# install +# FIXME: Is there really no way to see if dpkg actually prompts? +msgtest 'Test for successful execution of' 'apt-get install compiz-core=2.0' +OUTPUT=$(mktemp) +addtrap "rm $OUTPUT;" exec 3> apt-progress.log -echo n | aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false +if aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false -o dpkg::options::='--force-confold' >${OUTPUT} 2>&1; then + msgpass +else + echo + cat $OUTPUT + msgfail +fi # and ensure there is a conffile message in the file -msgtest "Conffile prompt in apt-progress.log" +msgtest 'Test status fd for an included' 'pmconffile msg' grep -q "pmconffile:/etc/compiz.conf/compiz.conf" apt-progress.log && msgpass || (cat apt-progress.log && msgfail) - -cat apt-progress.log
\ No newline at end of file |