diff options
| author | Julian Andres Klode <jak@debian.org> | 2021-04-29 08:28:08 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2021-04-29 08:28:08 +0000 |
| commit | a6cb741a2cd1fa132705f8f5644872fc9708fb68 (patch) | |
| tree | 9fa69d08cffef40cbf69e783ff3be4e52ff6f759 /test | |
| parent | 5d81ec308275b625a20b889fa3daa43815ddc80d (diff) | |
| parent | f90b892e6acc0ca725811ef0dd9be3fed66c444f (diff) | |
Merge branch 'pu/upgradecounter' into 'main'
Count uninstallable packages in "not upgraded"
See merge request apt-team/apt!169
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-explore-or-groups-in-markinstall | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/test/integration/test-explore-or-groups-in-markinstall b/test/integration/test-explore-or-groups-in-markinstall index ba3376cf6..b88105b6b 100755 --- a/test/integration/test-explore-or-groups-in-markinstall +++ b/test/integration/test-explore-or-groups-in-markinstall @@ -70,7 +70,6 @@ The following additional packages will be installed: The following NEW packages will be installed: foo-${1}-level${level} okay 0 upgraded, 2 newly installed, 0 to remove and 3 not upgraded." apt install foo-${1}-level${level} -s - if [ "$level" = '0' ]; then NOT=2; else NOT=1; fi testsuccessheadequal 9 "Reading package lists... Building dependency tree... The following additional packages will be installed: @@ -79,7 +78,7 @@ The following NEW packages will be installed: foo-${1}-upgrade-level${level} The following packages will be upgraded: upgrade -1 upgraded, 1 newly installed, 0 to remove and $NOT not upgraded." apt install foo-${1}-upgrade-level${level} -s +1 upgraded, 1 newly installed, 0 to remove and 2 not upgraded." apt install foo-${1}-upgrade-level${level} -s done testsuccessheadequal 7 "Reading package lists... @@ -93,6 +92,22 @@ The following NEW packages will be installed: checkfoos 'd' 'Depends' checkfoos 'r' 'Recommends' +testsuccessequal 'Reading package lists... +Building dependency tree... +Calculating upgrade... +The following NEW packages will be installed: + foo-d-upgrade-level2 (1) +The following packages have been kept back: + bad-upgrade-level0 (1 => 2) + bad-upgrade-level1 (1 => 2) +The following packages will be upgraded: + upgrade (1 => 2) +1 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. +Inst upgrade [1] (2 unstable [all]) +Inst foo-d-upgrade-level2 (1 unstable [all]) +Conf upgrade (2 unstable [all]) +Conf foo-d-upgrade-level2 (1 unstable [all])' apt full-upgrade foo-d-upgrade-level2 -sV + TEST_WITH_APTITUDE=false msgtest 'Check if aptitude is available for additional tests' if dpkg-checkbuilddeps -d 'aptitude' /dev/null >/dev/null 2>&1; then |