diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-11-02 16:02:44 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-04 18:42:28 +0100 |
| commit | cd46d4ebd33e74ee53bbc73dcdb7fe1d4d006558 (patch) | |
| tree | ebb72d38d8d7b21849cba5d6b2501cd0e1d94cba /test/integration/test-apt-acquire-additional-files | |
| parent | 2f91076de326a0dee067659381a9c4cf745f0efe (diff) | |
ensure FileFd doesn't try to open /dev/null as atomic and co
The wrapping will fail in the best case and actually end up deleting
/dev/null in the worst case. Given that there is no point in trying to
write atomically to /dev/null as you can't read from it again just
ignore these flags if higher level code ends up trying to use them on
/dev/null.
Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-apt-acquire-additional-files')
| -rwxr-xr-x | test/integration/test-apt-acquire-additional-files | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files index 552499ea2..0a9653ce6 100755 --- a/test/integration/test-apt-acquire-additional-files +++ b/test/integration/test-apt-acquire-additional-files @@ -31,6 +31,7 @@ Reading package lists..." aptget update testempty find rootdir/var/lib/apt/lists -name '*Contents*' +msgmsg "Normal Contents file" cat > rootdir/etc/apt/apt.conf.d/content-target.conf <<EOF Acquire::IndexTargets::deb::Contents { MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE)"; @@ -78,6 +79,7 @@ rm ./rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Cont testempty aptget indextargets --format '$(FILENAME)' 'Created-By: Contents' # if we asked for keeping it compressed, keep it +msgmsg "Normal Contents file with KeepCompressed" echo 'Acquire::IndexTargets::deb::Contents::KeepCompressed "true";' >> rootdir/etc/apt/apt.conf.d/content-target.conf testsuccessequal "Hit:1 http://localhost:${APTHTTPPORT} unstable InRelease Get:2 http://localhost:${APTHTTPPORT} unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B] @@ -94,6 +96,7 @@ rm ./rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Cont rm ./rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Contents-all.gz testempty aptget indextargets --format '$(FILENAME)' 'Created-By: Contents' +msgmsg "Compressed Contents file" # and no automatic uncompress based on the name please, # only if we downloaded a compressed file, but target was uncompressed cat > rootdir/etc/apt/apt.conf.d/content-target.conf <<EOF @@ -125,6 +128,7 @@ testsuccess cmp "rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstab testsuccess cmp "rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_dists_unstable_main_Contents-all.gz" 'aptarchive/dists/unstable/main/Contents-all.gz' rm -f rootdir/etc/apt/apt.conf.d/content-target.conf +msgmsg "No Contents file" testequal "'http://localhost:${APTHTTPPORT}/dists/unstable/InRelease' localhost:${APTHTTPPORT}_dists_unstable_InRelease 0 'http://localhost:${APTHTTPPORT}/dists/unstable/main/source/Sources.xz' localhost:${APTHTTPPORT}_dists_unstable_main_source_Sources 0 |