From 9bd81ac3c85d8c9fee01d0ecfc681841aa89e6eb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 17 Jan 2025 01:09:05 +0000 Subject: Grep for more evil in test as a signature can contain evil The test was failing for me as the PGP signature contained "GeviljGB" which is clearly not the evil we are looking for. Sadly, reproducing this is hard, but random failures of the test suite are annoying, so lets grep for a bit longer strings that can't happen in the signature block to avoid this particular problem. --- test/integration/test-apt-update-nofallback | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback index 95e445139..c7cad4a82 100755 --- a/test/integration/test-apt-update-nofallback +++ b/test/integration/test-apt-update-nofallback @@ -210,7 +210,7 @@ W: Some index files failed to download. They have been ignored, or old ones used fi # ensure we keep the repo - testfailure grep 'evil' rootdir/var/lib/apt/lists/*InRelease + testfailure grep ': evil' rootdir/var/lib/apt/lists/*InRelease testfileequal lists.before "$(listcurrentlistsdirectory)" assert_repo_is_intact } @@ -236,7 +236,7 @@ W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg The following W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq fi - testfailure grep 'evil' rootdir/var/lib/apt/lists/*Release + testfailure grep 'evil data' rootdir/var/lib/apt/lists/*Release testfileequal lists.before "$(listcurrentlistsdirectory)" assert_repo_is_intact } -- cgit v1.2.3-70-g09d2