diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2020-05-23 15:53:06 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2020-05-23 17:59:19 +0200 |
| commit | 4f71dc657c34915508a9e34b000e1b577931655a (patch) | |
| tree | 0e674c8abd70813755ec0dc6ca985c0985fa2a2c /test | |
| parent | 4d87856b94dae1a40a1a8147a6dbcfe714cd05c7 (diff) | |
Keep status number if candidate is discarded for kept back display
It looks like hack and therefore I wanted this to be a very isolated
commit so we can find it & revert it easily if need be, but for now it
seems to work.
The idea is that Status is telling us how the candidate is in relation
to the current installed version which is used to figure out if a
package is "kept back" by the algorithm or not, but by discarding the
candidate version we loose this information.
Ideally we would keep better tabs on what we do to a package and why,
but for now that seems okayish. It will cause the wrong version to be
displayed though as if the package is installed the installed version
becomes the candidate and hence (installed => installed) is displayed.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-bug-632221-cross-dependency-satisfaction | 2 | ||||
| -rwxr-xr-x | test/integration/test-bug-961266-hold-means-hold | 24 |
2 files changed, 10 insertions, 16 deletions
diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction index 752e2ad63..d52652cad 100755 --- a/test/integration/test-bug-632221-cross-dependency-satisfaction +++ b/test/integration/test-bug-632221-cross-dependency-satisfaction @@ -296,7 +296,7 @@ The following packages will be REMOVED: The following NEW packages will be installed: amdboot:amd64 arm-stuff cool doxygen libc6 libc6-dev libfwibble-dev libfwibble1 -0 upgraded, 8 newly installed, 1 to remove and 2 not upgraded. +0 upgraded, 8 newly installed, 1 to remove and 1 not upgraded. Remv cool:amd64 [0.5] Inst amdboot:amd64 (1.0 unstable [amd64]) Inst arm-stuff (1.0 unstable [armel]) diff --git a/test/integration/test-bug-961266-hold-means-hold b/test/integration/test-bug-961266-hold-means-hold index a104bfc31..89c18ba85 100755 --- a/test/integration/test-bug-961266-hold-means-hold +++ b/test/integration/test-bug-961266-hold-means-hold @@ -57,19 +57,13 @@ NOUPGRADE='Reading package lists... Building dependency tree... Calculating upgrade... The following packages have been kept back: - git -0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' -NOUPGRADE2='Reading package lists... -Building dependency tree... -Calculating upgrade... -The following packages have been kept back: git git-cvs 0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' testsuccessequal "$NOUPGRADE" apt upgrade -s testsuccessequal "$NOUPGRADE" apt full-upgrade -s testsuccessequal "$NOUPGRADE" aptget dist-upgrade -s -testsuccessequal "$NOUPGRADE2" aptget upgrade -s +testsuccessequal "$NOUPGRADE" aptget upgrade -s testfailureequal 'Reading package lists... Building dependency tree... @@ -89,10 +83,10 @@ testsuccessequal 'Canceled hold on git.' aptmark unhold git testsuccessequal 'git-cvs set on hold.' aptmark hold git-cvs testsuccessequal 'git-cvs' aptmark showholds -testsuccessequal "$NOUPGRADE2" apt upgrade -s -testsuccessequal "$NOUPGRADE2" apt full-upgrade -s -testsuccessequal "$NOUPGRADE2" aptget upgrade -s -testsuccessequal "$NOUPGRADE2" aptget dist-upgrade -s +testsuccessequal "$NOUPGRADE" apt upgrade -s +testsuccessequal "$NOUPGRADE" apt full-upgrade -s +testsuccessequal "$NOUPGRADE" aptget upgrade -s +testsuccessequal "$NOUPGRADE" aptget dist-upgrade -s testfailureequal 'Reading package lists... Building dependency tree... @@ -112,10 +106,10 @@ testsuccessequal 'git set on hold.' aptmark hold git testsuccessequal 'git git-cvs' aptmark showholds -testsuccessequal "$NOUPGRADE2" apt upgrade -s -testsuccessequal "$NOUPGRADE2" apt full-upgrade -s -testsuccessequal "$NOUPGRADE2" aptget upgrade -s -testsuccessequal "$NOUPGRADE2" aptget dist-upgrade -s +testsuccessequal "$NOUPGRADE" apt upgrade -s +testsuccessequal "$NOUPGRADE" apt full-upgrade -s +testsuccessequal "$NOUPGRADE" aptget upgrade -s +testsuccessequal "$NOUPGRADE" aptget dist-upgrade -s testfailureequal 'Reading package lists... Building dependency tree... |