From 25b86db159fbc3c043628e285c0c1ef24dec2c6e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 10 Mar 2015 00:59:44 +0100 Subject: test exitcode as well as string equality We use test{success,failure} now all over the place in the framework, so its only consequencial to do this in the situations in which we test for a specific output as well. Git-Dch: Ignore --- test/integration/test-apt-get-update-unauth-warning | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/integration/test-apt-get-update-unauth-warning') diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning index 80c51152d..81c01ba3e 100755 --- a/test/integration/test-apt-get-update-unauth-warning +++ b/test/integration/test-apt-get-update-unauth-warning @@ -19,7 +19,7 @@ APTARCHIVE=$(readlink -f ./aptarchive) rm -f $APTARCHIVE/dists/unstable/*Release* # update without authenticated files leads to warning -testequal "Ign file: unstable InRelease +testfailureequal "Ign file: unstable InRelease File not found Err file: unstable Release File not found @@ -27,18 +27,18 @@ W: The repository 'file: unstable Release' does not have a Release file. This is E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories # no package foo -testequal 'Listing...' apt list foo +testsuccessequal 'Listing...' apt list foo testequal 'lock partial' ls rootdir/var/lib/apt/lists # allow override -testequal "Ign file: unstable InRelease +testwarningequal "Ign file: unstable InRelease File not found Ign file: unstable Release File not found Reading package lists... W: The repository 'file: unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories # ensure we can not install the package -testequal "WARNING: The following packages cannot be authenticated! +testfailureequal "WARNING: The following packages cannot be authenticated! foo E: There are problems and -y was used without --force-yes" aptget install -qq -y foo -- cgit v1.2.3