summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-progress-fd-conffile
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-21 07:20:07 +0100
committerMichael Vogt <mvo@debian.org>2014-01-21 07:20:07 +0100
commitf744c64c591cec9e5aa489a9af55e1ed6d1871d1 (patch)
treede1d27910d66062508b22c5a7b46c288d1b3fab9 /test/integration/test-apt-progress-fd-conffile
parent7f316a3feab95370f1dd28c08c58bc3c140bf0a0 (diff)
parent1700c3cfb902f3f61fa4d9269523467fcceaaf58 (diff)
Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822
Conflicts: test/integration/test-apt-sources-deb822
Diffstat (limited to 'test/integration/test-apt-progress-fd-conffile')
-rwxr-xr-xtest/integration/test-apt-progress-fd-conffile17
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