summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-03-27 19:59:44 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-04-19 01:13:09 +0200
commita09f6eb8fc67cd2d836019f448f18580396185e5 (patch)
tree36821d1225e4670a36779d5d88e522166da72188 /test/integration
parent936d5613e4b6145798c5a1d0c484158115576fa8 (diff)
send Alt-* info for uncompressed based on any compressions
file sends information about the uncompressed file if it can find it as well as for the compressed file. This was done only for gzip so far, but we support more compression types. That this information isn't used a lot is a different story. Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/framework2
-rwxr-xr-xtest/integration/test-compressed-indexes2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 50c027a2c..994956b74 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -3,7 +3,7 @@
EXIT_CODE=0
# we all like colorful messages
-if [ "$MSGCOLOR" != 'NO' ]; then
+if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
if [ ! -t 1 ]; then # but check that we output to a terminal
export MSGCOLOR='NO'
fi
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 5b966754c..c6b292baa 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -61,7 +61,7 @@ testrun() {
cd downloaded
testsuccess --nomsg aptget download testpkg
msgtest '\tdeb file is present'; testsuccess --nomsg test -f testpkg_1.0_i386.deb
- rm testpkg_1.0_i386.deb
+ rm -f testpkg_1.0_i386.deb
cd - >/dev/null
testsuccessequal 'Reading package lists...
Building dependency tree...