From 385d9f2f23057bc5808b5e013e77ba16d1c94da4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 7 Jun 2016 17:01:33 +0200 Subject: edsp: optionally store a compressed copy of the last scenario For bugreports and co it could be handy to have the scenario and all the settings used in it around later for inspection for EDSP like protocols. EDSP might not be the most interesting as the user can still interrupt the process before the solution is applied and users tend to have an opinion on the "rightness" of a solution, so it is disabled by default. --- .../test-external-dependency-solver-protocol | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol index 4b13edc09..10b07e896 100755 --- a/test/integration/test-external-dependency-solver-protocol +++ b/test/integration/test-external-dependency-solver-protocol @@ -25,11 +25,17 @@ insertpackage 'experimental' 'coolstuff' 'i386,amd64' '3' 'Depends: cool, stuff' setupaptarchive +testsuccess aptget install --solver apt coolstuff -s +testempty find -name 'edsp.last.*' +echo 'Dir::Log::Solver "edsp.last.xz";' > rootdir/etc/apt/apt.conf.d/log-edsp.conf + testfailure aptget install --solver dump coolstuff -s -testsuccess grep ERR_NO_FILENAME rootdir/tmp/testfailure.output +testsuccess grep 'ERR_NO_FILENAME' rootdir/tmp/testfailure.output +testfailure test -s rootdir/var/log/apt/edsp.last.xz export APT_EDSP_DUMP_FILENAME="/nonexistent/apt/edsp.dump" testfailure aptget install --solver dump coolstuff -s -testsuccess grep ERR_WRITE_ERROR rootdir/tmp/testfailure.output +testsuccess grep 'ERR_CREATE_FILE' rootdir/tmp/testfailure.output +testfailure test -s rootdir/var/log/apt/edsp.last.xz export APT_EDSP_DUMP_FILENAME="${TMPWORKINGDIRECTORY}/downloaded/dump.edsp" testfailureequal 'Reading package lists... @@ -41,8 +47,8 @@ I am too dumb, i can just dump! Please use one of my friends instead! E: External solver failed with: I am too dumb, i can just dump!' aptget install --solver dump coolstuff -s +testfailure test -s rootdir/var/log/apt/edsp.last.xz testsuccess test -s "$APT_EDSP_DUMP_FILENAME" -rm -f "$APT_EDSP_DUMP_FILENAME" testsuccessequal 'Reading package lists... Building dependency tree... @@ -52,6 +58,12 @@ The following NEW packages will be installed: 0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. Inst coolstuff (2 unstable [amd64]) Conf coolstuff (2 unstable [amd64])' aptget install --solver apt coolstuff -s +testsuccess test -s rootdir/var/log/apt/edsp.last.xz +sed -i -e 's#^Solver: dump$#Solver: apt#' "$APT_EDSP_DUMP_FILENAME" +testequal "$(cat "$APT_EDSP_DUMP_FILENAME") +" apthelper cat-file rootdir/var/log/apt/edsp.last.xz +cp rootdir/var/log/apt/edsp.last.xz rootdir/var/log/apt/edsp.last.xz.1 +rm -f "$APT_EDSP_DUMP_FILENAME" testsuccessequal 'Reading package lists... Building dependency tree... @@ -61,6 +73,7 @@ The following NEW packages will be installed: 0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. Inst coolstuff (3 experimental [amd64]) Conf coolstuff (3 experimental [amd64])' aptget install --solver apt coolstuff -s -t experimental +testfailure cmp rootdir/var/log/apt/edsp.last.xz rootdir/var/log/apt/edsp.last.xz.1 testsuccessequal "Reading package lists... Building dependency tree... -- cgit v1.2.3-70-g09d2