From cbb576cbccdf0a7dbc9ff647078e99b194d1d619 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 28 Jul 2017 18:49:18 +0300 Subject: [PATCH] Fix up system tests --- system/t04_mirror/CreateMirror30Test_gold | 5 +++-- system/t06_publish/PublishRepo31Test_gold | 2 +- system/t06_publish/repo.py | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/system/t04_mirror/CreateMirror30Test_gold b/system/t04_mirror/CreateMirror30Test_gold index e01c573d..94ee222b 100644 --- a/system/t04_mirror/CreateMirror30Test_gold +++ b/system/t04_mirror/CreateMirror30Test_gold @@ -1,10 +1,11 @@ opengpg: failure opening keyring '${HOME}/.gnupg/aptlytest.gpg': open ${HOME}/.gnupg/aptlytest.gpg: no such file or directory + Looks like your keyring with trusted keys is empty. You might consider importing some keys. Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/InRelease... -openpgp: Signature made Sun, 13 Mar 2016 12:02:54 MSK using RSA key ID 8B48AD6246925553 +openpgp: RSA key ID 8B48AD6246925553 openpgp: Can't check signature: public key not found Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/Release... Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/Release.gpg... -openpgp: Signature made Sun, 13 Mar 2016 12:02:54 MSK using RSA key ID 8B48AD6246925553 +openpgp: RSA key ID 8B48AD6246925553 openpgp: Can't check signature: public key not found ERROR: unable to fetch mirror: failed to verify detached signature: openpgp: signature made by unknown entity diff --git a/system/t06_publish/PublishRepo31Test_gold b/system/t06_publish/PublishRepo31Test_gold index 1c29ddaf..11837d56 100644 --- a/system/t06_publish/PublishRepo31Test_gold +++ b/system/t06_publish/PublishRepo31Test_gold @@ -1,5 +1,5 @@ openpgp: Passphrase is required to unlock private key "Aptly Tester (don't use it) " -openpgp: 1024-bit DSA key, ID F30E8CB9CDDE2AF8, created 2014-08-30 +openpgp: 1024-bit DSA key, ID F30E8CB9CDDE2AF8, created Loading packages... Generating metadata files and linking package files... Finalizing metadata files... diff --git a/system/t06_publish/repo.py b/system/t06_publish/repo.py index 6d24e7bf..a476658f 100644 --- a/system/t06_publish/repo.py +++ b/system/t06_publish/repo.py @@ -1,6 +1,7 @@ import os import hashlib import inspect +import re import zlib from lib import BaseTest @@ -747,6 +748,9 @@ class PublishRepo31Test(BaseTest): gold_processor = BaseTest.expand_environ configOverride = {"gpgProvider": "internal"} + def outputMatchPrepare(_, s): + return re.sub(r' \d{4}-\d{2}-\d{2}', '', s) + def check(self): super(PublishRepo31Test, self).check()