diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-04-12 18:16:23 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-04-12 18:16:23 +0000 |
| commit | b8e77c400eaec5983772f50d3f728373b5981866 (patch) | |
| tree | ae0ba3624bef3e1549e2bf0f555590eb98e6513b /test | |
| parent | 81c65f7e86b8f16eaaa91d9c205a594b0ebde159 (diff) | |
| parent | f725565ae69a06d0ad5747881b6f54a19c0c1763 (diff) | |
Merge branch 'terse-ui' into 'main'
Introduce new output format for apt(8)
See merge request apt-team/apt!337
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/framework | 1 | ||||
| -rwxr-xr-x | test/integration/test-bug-470115-new-and-tighten-recommends | 2 | ||||
| -rwxr-xr-x | test/integration/test-ubuntu-bug-614993 | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/test/integration/framework b/test/integration/framework index 0570d5c8e..147de9808 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -444,6 +444,7 @@ _setupprojectenvironment() { echo "Dir::Etc \"etc/apt\";" >> aptconfig.conf echo "Dir::Log \"var/log/apt\";" >> aptconfig.conf echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf + echo "Binary::apt::APT::Output-Version \"0\";" >> aptconfig.conf echo "Dir::Bin::Methods \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods\";" >> aptconfig.conf # either store apt-key were we can access it, even if we run it as a different user #cp "${APTCMDLINEBINDIR}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/" diff --git a/test/integration/test-bug-470115-new-and-tighten-recommends b/test/integration/test-bug-470115-new-and-tighten-recommends index f27990e3e..e1c272b18 100755 --- a/test/integration/test-bug-470115-new-and-tighten-recommends +++ b/test/integration/test-bug-470115-new-and-tighten-recommends @@ -165,8 +165,6 @@ Conf upgrade-over-new (2 unstable [all])' aptget install upgrade-over-new -s # the user doesn't seem to need it so avoid upgrading it testsuccessequal 'Reading package lists... Building dependency tree... -Recommended packages: - cool The following packages will be upgraded: now-satisfiable 1 upgraded, 0 newly installed, 0 to remove and 12 not upgraded. diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993 index 542e55105..fe830b499 100755 --- a/test/integration/test-ubuntu-bug-614993 +++ b/test/integration/test-ubuntu-bug-614993 @@ -28,10 +28,6 @@ The following additional packages will be installed: xserver-xorg-video-sisusb xserver-xorg-video-tdfx xserver-xorg-video-trident xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware xserver-xorg-video-voodoo -Suggested packages: - xfonts-scalable gpointing-device-settings touchfreeze firmware-linux -Recommended packages: - xauth intel-gpu-tools The following packages will be REMOVED: xserver-xorg-video-v4l The following NEW packages will be installed: |