diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-02-03 12:38:28 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-02-03 12:38:28 +0000 |
| commit | 4137efbb2ec78bd3c8b8263ff20134d7fdc6f75b (patch) | |
| tree | a7b1387dfc6f8edb253c02e162b61b076f0d8ed7 /test/integration | |
| parent | 565d3fb1a53ef8766b947a960c07043fa021d515 (diff) | |
| parent | f9ff99d699209aa97ba788bad86a15313751c230 (diff) | |
Merge branch 'main' into 'main'
Also support debian-ports modernization
See merge request apt-team/apt!443
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-apt-modernize-sources | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/integration/test-apt-modernize-sources b/test/integration/test-apt-modernize-sources index 26fd8055a..6a23a73d3 100755 --- a/test/integration/test-apt-modernize-sources +++ b/test/integration/test-apt-modernize-sources @@ -9,6 +9,7 @@ configarchitecture 'native' echo 'deb http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list.d/rocks.list echo 'deb http://deb.debian.org/debian stable main' >> rootdir/etc/apt/sources.list +echo 'deb http://deb.debian.org/debian-ports unstable main' >> rootdir/etc/apt/sources.list echo 'deb-src http://deb.debian.org/debian stable main' >> rootdir/etc/apt/sources.list echo 'deb-src http://deb.debian.org/debian unstable main' >> rootdir/etc/apt/sources.list echo 'deb http://example.org/debian stable bananas' >> rootdir/etc/apt/sources.list @@ -19,10 +20,13 @@ mkdir -p rootdir/usr/share/keyrings/ mkdir -p rootdir/var/lib/apt/lists echo > rootdir/etc/apt/trusted.gpg.d/rocks.gpg echo > rootdir/usr/share/keyrings/debian-archive-keyring.gpg +echo > rootdir/usr/share/keyrings/debian-ports-archive-keyring.gpg echo "Date: $(date -ud '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" > rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_unstable_InRelease echo "Date: $(date -ud '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" > rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_stable_InRelease +echo "Date: $(date -ud '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" > rootdir/var/lib/apt/lists/deb.debian.org_debian-ports_dists_unstable_InRelease echo "Origin: Debian" >> rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_unstable_InRelease echo "Origin: Debian" >> rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_stable_InRelease +echo "Origin: Debian Ports" >> rootdir/var/lib/apt/lists/deb.debian.org_debian-ports_dists_unstable_InRelease # We test that appending produces valid output here, so we already configure a source in here. echo "Types: deb" >> rootdir/etc/apt/sources.list.d/debian.sources @@ -36,6 +40,7 @@ testwarning apt modernize-sources -y testsuccessequal "rootdir/etc/apt/sources.list.bak rootdir/etc/apt/sources.list.d: +debian-ports.sources debian.sources moved-from-main.sources rocks.list.bak @@ -61,6 +66,13 @@ Suites: unstable Components: main Signed-By: ${TMPWORKINGDIRECTORY}/rootdir/usr/share/keyrings/debian-archive-keyring.gpg" +testfileequal rootdir/etc/apt/sources.list.d/debian-ports.sources "# Modernized from ${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list +Types: deb +URIs: http://deb.debian.org/debian-ports/ +Suites: unstable +Components: main +Signed-By: ${TMPWORKINGDIRECTORY}/rootdir/usr/share/keyrings/debian-ports-archive-keyring.gpg" + testfileequal rootdir/etc/apt/sources.list.d/rocks.sources "Types: deb URIs: http://example.org/debian/ Suites: stable |