summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJustin B Rye <justin.byam.rye@gmail.com>2015-11-21 17:50:06 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-21 18:04:29 +0100
commitd04e44ac8177fc5b70ae0189bb5e437c2502f910 (patch)
tree6ba968bf2a80d788c506007a4c1c0b233f2013c6 /test
parentabd6af5a1ce2c20a5742c5c3182dfadce10367ca (diff)
review of new/changed translatable program strings
Reference mail: https://lists.debian.org/debian-l10n-english/2015/11/msg00006.html
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-apt-get-update-unauth-warning4
-rwxr-xr-xtest/integration/test-apt-update-failure-propagation6
-rwxr-xr-xtest/integration/test-apt-update-ims6
-rwxr-xr-xtest/integration/test-apt-update-nofallback2
-rwxr-xr-xtest/integration/test-sourceslist-trusted-options2
5 files changed, 10 insertions, 10 deletions
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 795e0f39e..c2b20468a 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -34,7 +34,7 @@ Err:2 file:$APTARCHIVE unstable Release
File not found - ${APTARCHIVE}/dists/unstable/Release (2: No such file or directory)
Reading package lists...
E: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file.
-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating such a repository securely is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --no-allow-insecure-repositories
# no package foo
@@ -84,7 +84,7 @@ Get:5 file:$APTARCHIVE unstable/main all Packages [$(filesize 'Packages' 'Archit
Get:6 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
Reading package lists...
W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file.
-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --allow-insecure-repositories
# ensure we can not install the package
testfailureequal "WARNING: The following packages cannot be authenticated!
diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation
index b68d85044..17d27bbaa 100755
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -44,7 +44,7 @@ testsuccessequal "foo:
pretest
mv aptarchive/dists/stable aptarchive/dists/stable.good
testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating such a repository securely is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." apt update
testfailure aptget update --no-allow-insecure-repositories
testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
@@ -54,7 +54,7 @@ Err:3 https://localhost:${APTHTTPSPORT} stable Release
404 Not Found
Reading package lists...
E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating such a repository securely is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." "Ign:1 https://localhost:${APTHTTPSPORT} stable InRelease
404 Not Found
Err:2 https://localhost:${APTHTTPSPORT} stable Release
@@ -62,7 +62,7 @@ Err:2 https://localhost:${APTHTTPSPORT} stable Release
Hit:3 http://localhost:${APTHTTPPORT} sid InRelease
Reading package lists...
E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating such a repository securely is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." cat rootdir/tmp/testfailure.output
mv aptarchive/dists/stable.good aptarchive/dists/stable
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 747752540..553ae92df 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -83,7 +83,7 @@ Ign:3 http://localhost:${APTHTTPPORT} unstable Release.gpg
404 Not Found
Reading package lists...
W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.
-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.
N: See apt-secure(8) manpage for repository creation and user configuration details."
find aptarchive -name 'Release.gpg' -delete
echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
@@ -128,7 +128,7 @@ Ign:3 http://localhost:${APTHTTPPORT} unstable Release.gpg
404 Not Found
Reading package lists...
W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.
-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.
N: See apt-secure(8) manpage for repository creation and user configuration details.
E: Release file for http://localhost:${APTHTTPPORT}/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
find aptarchive -name 'Release.gpg' -delete
@@ -173,7 +173,7 @@ Hit:5 http://localhost:${APTHTTPPORT} unstable/main all Packages
Hit:6 http://localhost:${APTHTTPPORT} unstable/main Translation-en
Reading package lists...
W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' does not have a Release file.
-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.
N: See apt-secure(8) manpage for repository creation and user configuration details."
find aptarchive -name '*Release*' -delete
echo 'Acquire::GzipIndexes "0";
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 89b197129..aeff1791d 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -34,7 +34,7 @@ EOF
assert_update_is_refused_and_last_good_state_used()
{
testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed.
-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating such a repository securely is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update
assert_repo_is_intact
diff --git a/test/integration/test-sourceslist-trusted-options b/test/integration/test-sourceslist-trusted-options
index 78c705b0f..26de76807 100755
--- a/test/integration/test-sourceslist-trusted-options
+++ b/test/integration/test-sourceslist-trusted-options
@@ -203,7 +203,7 @@ everythingfails -t testing
msgmsg 'Test conflicting trusted options are refused'
testsource() {
echo "$@" > rootdir/etc/apt/sources.list.d/example.list
- testfailuremsg 'E: Conflicting values set for option Trusted concerning source http://example.org/bad/ unstable
+ testfailuremsg 'E: Conflicting values set for option Trusted regarding source http://example.org/bad/ unstable
E: The list of sources could not be read.' aptget update --print-uris
}
for VAL in 'yes' 'no'; do