From 57a51d94ed95bc5ff8c0635b30d1581da6bf4c6d Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Fri, 15 Jun 2018 15:43:02 +0200 Subject: [PATCH] Fix failing SHA512 checksums only test This test has been failing very often because of changes in nvidia repository. As this test is not related to filtering remove number of filtered packages from output for a more robust test. --- system/t04_mirror/UpdateMirror22Test_gold | 2 +- system/t04_mirror/update.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/t04_mirror/UpdateMirror22Test_gold b/system/t04_mirror/UpdateMirror22Test_gold index 75ac9635..296cc0bd 100644 --- a/system/t04_mirror/UpdateMirror22Test_gold +++ b/system/t04_mirror/UpdateMirror22Test_gold @@ -4,7 +4,7 @@ openpgp: Good signature from "NVIDIA CORPORATION (Open Source Projects) 0. + Building download queue... Download queue: 0 items (0 B) diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py index 3ec79144..5f63ec35 100644 --- a/system/t04_mirror/update.py +++ b/system/t04_mirror/update.py @@ -373,4 +373,6 @@ class UpdateMirror22Test(BaseTest): "aptly mirror create --keyring=aptlytest.gpg --filter=nomatch libnvidia-container https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64 ./" ] runCmd = "aptly mirror update --keyring=aptlytest.gpg libnvidia-container" - outputMatchPrepare = filterOutSignature + + def outputMatchPrepare(_, s): + return re.sub(r'Signature made .* using|Packages filtered: .* -> 0.', '', s)