Fix tests for flat repos

This commit is contained in:
Andrey Smirnov
2017-05-17 00:09:18 +03:00
parent 5a3e660c0d
commit 829ea2e65c
3 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
Building download queue... Building download queue...
Download queue: 84 items (138.28 MiB) Download queue: 84 items (138.29 MiB)
Downloading & parsing package files... Downloading & parsing package files...
Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/InRelease... Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/InRelease...
Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/Packages.bz2... Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/Packages.bz2...
+1 -1
View File
@@ -1,7 +1,7 @@
Building download queue... Building download queue...
Download queue: 160 items (184.37 MiB) Download queue: 160 items (184.38 MiB)
Downloading & parsing package files... Downloading & parsing package files...
Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/InRelease... Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/InRelease...
Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/Packages.bz2... Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran3/Packages.bz2...
+4 -1
View File
@@ -168,8 +168,11 @@ class CreateMirror14Test(BaseTest):
return re.sub(r'Signature made .* using', '', s) return 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 mirror14", "mirror_show") self.check_cmd_output("aptly mirror show mirror14", "mirror_show", match_prepare=removeDates)
class CreateMirror15Test(BaseTest): class CreateMirror15Test(BaseTest):