Output match processor to fix CentOS build was placed incorrectly.

This commit is contained in:
Andrey Smirnov
2014-02-10 23:13:49 +04:00
parent 4020e30f07
commit 421283d161
+2 -2
View File
@@ -119,7 +119,7 @@ class CreateMirror11Test(BaseTest):
""" """
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ squeeze" runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ squeeze"
fixtureGpg = True fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE) outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def check(self): def check(self):
self.check_output() self.check_output()
@@ -133,7 +133,7 @@ class CreateMirror12Test(BaseTest):
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://mirror.yandex.ru/debian/ squeeze" runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://mirror.yandex.ru/debian/ squeeze"
fixtureGpg = False fixtureGpg = False
gold_processor = BaseTest.expand_environ 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 expectedCode = 1