From 8407e70347a22b8da6a6023658cbbd1f5e680702 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 28 Jul 2014 16:20:38 +0400 Subject: [PATCH] Fix system tests. #15 --- system/t02_config/CreateConfigTest_gold | 2 +- system/t04_mirror/edit.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/system/t02_config/CreateConfigTest_gold b/system/t02_config/CreateConfigTest_gold index 996ac73d..53c77185 100644 --- a/system/t02_config/CreateConfigTest_gold +++ b/system/t02_config/CreateConfigTest_gold @@ -1,5 +1,5 @@ { - "rootDir": "/Users/smira/.aptly", + "rootDir": "${HOME}/.aptly", "downloadConcurrency": 4, "downloadSpeedLimit": 0, "architectures": [], diff --git a/system/t04_mirror/edit.py b/system/t04_mirror/edit.py index e3991442..6453ad11 100644 --- a/system/t04_mirror/edit.py +++ b/system/t04_mirror/edit.py @@ -53,7 +53,8 @@ class EditMirror5Test(BaseTest): runCmd = "aptly mirror edit -filter= mirror5" 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_cmd_output("aptly mirror show mirror5", "mirror_show") - - + self.check_cmd_output("aptly mirror show mirror5", "mirror_show", match_prepare=removeDates)