properly format multiline error messages

[apt.git] / test / integration / test-apt-update-nofallback

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 89b197129353d0e9805a004851b0486d646170bb..d9166eefd10589177aec610a012687dd9c876fec 100755 (executable)
--- 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.
 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 from such a repository can't be done securely, and is therefore disabled by default.

 N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update
 
     assert_repo_is_intact
 N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update
 
     assert_repo_is_intact


@@ -149,7 +149,7 @@ test_subvert_inrelease()
     # replace InRelease with something else
     mv "$APTARCHIVE/dists/unstable/Release" "$APTARCHIVE/dists/unstable/InRelease"
 
     # replace InRelease with something else
     mv "$APTARCHIVE/dists/unstable/Release" "$APTARCHIVE/dists/unstable/InRelease"
 

-    testfailuremsg "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?)
+    testfailuremsg "E: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease  Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?)

 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 
     # ensure we keep the repo
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 
     # ensure we keep the repo


@@ -200,8 +200,8 @@ W: Some index files failed to download. They have been ignored, or old ones used
 }
 
 
 }
 
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"


@@ -225,7 +225,7 @@ test_from_release_gpg_to_unsigned
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 

-# ensure InRelase can not be subverted
+# ensure InRelease can not be subverted

 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease
 
 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease