Merge branch 'feature/extractar-filefd' into debian/experimental

[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 2f4ddc016bedbc276098bf251a01819987b3de51..dae537c32c6d7ed782fe8f5c2891f2ca015cb6c0 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -101,7 +101,7 @@ test_from_inrelease_to_unsigned_with_override()
     # but that the individual packages are still considered untrusted
     testfailureequal "WARNING: The following packages cannot be authenticated!
   evil
-E: There are problems and -y was used without --force-yes" aptget install -qq -y evil
+E: There were unauthenticated packages and -y was used without --allow-unauthenticated" aptget install -qq -y evil
 }
 
 test_cve_2012_0214()
@@ -115,7 +115,7 @@ test_cve_2012_0214()
     # the unauthenticated Release file too giving the false impression that
     # Release was authenticated
     #
-    # Note that this is pretty much impossible nowdays because:
+    # Note that this is pretty much impossible nowadays because:
     # a) InRelease is left as is, not split to InRelease/Release as it was 
     #    in the old days
     # b) we refuse to go from signed->unsigned