From a5497787545e591887d80a95b998372dd5bfe2b4 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sat, 30 Aug 2014 01:16:42 +0400 Subject: [PATCH] Fix system tests. #48 --- system/t03_help/MirrorCreateHelpTest_gold | 2 +- system/t04_mirror/update.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/t03_help/MirrorCreateHelpTest_gold b/system/t03_help/MirrorCreateHelpTest_gold index efde9452..25c2e7f2 100644 --- a/system/t03_help/MirrorCreateHelpTest_gold +++ b/system/t03_help/MirrorCreateHelpTest_gold @@ -1,7 +1,7 @@ Usage: aptly mirror create [ ...] Creates mirror of remote repository, aptly supports both regular and flat Debian repositories exported -via HTTP. aptly would try download Release file from remote repository and verify its' signature. Command +via HTTP and FTP. aptly would try download Release file from remote repository and verify its' signature. Command line format resembles apt utlitily sources.list(5). PPA urls could specified in short format: diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py index 2bd3a530..41d6edbc 100644 --- a/system/t04_mirror/update.py +++ b/system/t04_mirror/update.py @@ -151,6 +151,7 @@ class UpdateMirror11Test(BaseTest): fixtureCmds = [ "aptly mirror create -keyring=aptlytest.gpg -filter='Priority (required)' -architectures=i386 wheezy-main ftp://ftp.ru.debian.org/debian/ wheezy main", ] + outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) runCmd = "aptly mirror update -keyring=aptlytest.gpg wheezy-main" def output_processor(self, output):