diff options
| author | Julian Andres Klode <jak@debian.org> | 2026-04-07 09:40:22 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2026-04-07 09:40:22 +0000 |
| commit | 2757f593507ced8145fc75d986721dff6d45daa5 (patch) | |
| tree | 1a91836812c578f2919488fe2a88f74c31a1a5b6 /test/integration | |
| parent | 9a97c0e647609da41a1df6574d98320e5e253988 (diff) | |
| parent | f0c71b95ca00bae2b364c4b4858c51d84b002387 (diff) | |
Merge branch 'drop-apt-warning' into 'main'
Drop warning about unstable CLI interface
See merge request apt-team/apt!556
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 1 | ||||
| -rwxr-xr-x | test/integration/test-apt-cli-show | 5 | ||||
| -rwxr-xr-x | test/integration/test-bug-818628-unreadable-source | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/test/integration/framework b/test/integration/framework index 7780ef835..88a0bab7b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -573,7 +573,6 @@ EOF chown _apt:$(id -gn) "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem" fi echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https - echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=no echo 'Acquire::Connect::AddrConfig "false";' > rootdir/etc/apt/apt.conf.d/connect-addrconfig # Allow release files to be 10 hours in the future, rather than 10 seconds diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 8f9aa036f..c7a0983bd 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -196,11 +196,6 @@ Description: Some description That has multiple lines " apt info multi -a -# this is the default, but disabled by the testcases -testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0 -cp rootdir/tmp/testsuccess.output aptshow.output -testsuccess grep '^WARNING: ' aptshow.output - if [ "$(id -u)" != '0' ]; then testsuccess apt install foo -s -o APT::Get::Show-User-Simulation-Note=1 cp rootdir/tmp/testsuccess.output aptshow.output diff --git a/test/integration/test-bug-818628-unreadable-source b/test/integration/test-bug-818628-unreadable-source index e7ad26d04..2d942f3fe 100755 --- a/test/integration/test-bug-818628-unreadable-source +++ b/test/integration/test-bug-818628-unreadable-source @@ -56,7 +56,6 @@ N: There is 1 additional record. Please use the '-a' switch to see it}" testwarningmsg "$ERR" aptmark manual foo testwarningmsg "$ERR" aptmark auto foo } -echo 'Apt::Cmd::Disable-Script-Warning "true";' >> aptconfig.conf msgmsg 'Unreadable one-line-style sources file' chmod -r rootdir/etc/apt/sources.list.d/apt-test-unstable-deb-src.list |