diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-11 09:08:37 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-11 09:08:37 +0100 |
| commit | 5645e8b1cebb57134df717b8339248811cb762f2 (patch) | |
| tree | 8846e3f411cea65217944154e6da70c11b00dbaa /test/integration | |
| parent | 86e2dc4dd728924d71995ebaeb83a4d9abba94d5 (diff) | |
| parent | 1dda80929fcd62c287a84f1ecc1277fc39890efe (diff) | |
merged from debian-sid
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 4 | ||||
| -rwxr-xr-x | test/integration/test-bug-595691-empty-and-broken-archive-files | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework index e10709079..121678d4b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -592,12 +592,12 @@ testequalor2() { } testshowvirtual() { - local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual" + local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual" local PACKAGE="$1" shift while [ -n "$1" ]; do VIRTUAL="${VIRTUAL} -N: Can't select versions from package '$1' as it purely virtual" +N: Can't select versions from package '$1' as it is purely virtual" PACKAGE="${PACKAGE} $1" shift done diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index 684559aa7..2179ba03b 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -97,7 +97,7 @@ Err file: Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives -E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" +E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" } testoverhttp() { @@ -131,7 +131,7 @@ Err http://localhost Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives -E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" +E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" } for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done |