From 4020e30f0724f88ea25bcb05df89e08b304a6d2a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 10 Feb 2014 22:53:52 +0400 Subject: [PATCH] Fixing system test on CentOS (different version of gpg). --- system/t04_mirror/create.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 56b9d752..59860127 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -109,7 +109,7 @@ class CreateMirror10Test(BaseTest): runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://mirror.yandex.ru/debian-backports/ squeeze-backports" fixtureGpg = False gold_processor = BaseTest.expand_environ - outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) + outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE) expectedCode = 1 @@ -119,7 +119,7 @@ class CreateMirror11Test(BaseTest): """ runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ squeeze" fixtureGpg = True - outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) + outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE) def check(self): self.check_output()