Fix tests.

This commit is contained in:
Andrey Smirnov
2014-02-07 13:41:53 +04:00
parent f3bad4ee2c
commit 36892a2797
3 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -7,4 +7,4 @@ Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/Rel
gpgv: keyblock resource `${HOME}/.gnupg/aptlytest.gpg': file open error gpgv: keyblock resource `${HOME}/.gnupg/aptlytest.gpg': file open error
gpgv: RSA key ID 46925553 gpgv: RSA key ID 46925553
gpgv: Can't check signature: public key not found gpgv: Can't check signature: public key not found
ERROR: unable to fetch mirror: GnuPG verification of detached signature failed: exit status 2 ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2
+1 -1
View File
@@ -6,4 +6,4 @@ gpgv: RSA key ID 473041FA
gpgv: Can't check signature: public key not found gpgv: Can't check signature: public key not found
gpgv: RSA key ID B98321F9 gpgv: RSA key ID B98321F9
gpgv: Can't check signature: public key not found gpgv: Can't check signature: public key not found
ERROR: unable to fetch mirror: GnuPG verification of detached signature failed: exit status 2 ERROR: unable to fetch mirror: verification of detached signature failed: exit status 2
+4 -1
View File
@@ -95,8 +95,11 @@ class CreateMirror9Test(BaseTest):
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def check(self): def check(self):
def removeDates(s):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
self.check_output() self.check_output()
self.check_cmd_output("aptly mirror show mirror9", "mirror_show") self.check_cmd_output("aptly mirror show mirror9", "mirror_show", match_prepare=removeDates)
class CreateMirror10Test(BaseTest): class CreateMirror10Test(BaseTest):