Bump Go versions for Travis, fix tests

Replace gometalinter with golangci-lint.

Fix system tests (wheezy is gone, replace with stretch).

Fix linter warnings.
This commit is contained in:
Andrey Smirnov
2019-06-28 20:56:35 +03:00
parent e2d6a53de5
commit 2c91bcdc30
116 changed files with 1503 additions and 1067 deletions
+4 -4
View File
@@ -6,7 +6,7 @@ class ShowMirror1Test(BaseTest):
"""
show mirror: regular mirror
"""
fixtureCmds = ["aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ wheezy"]
fixtureCmds = ["aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch"]
runCmd = "aptly mirror show mirror1"
@@ -25,7 +25,7 @@ class ShowMirror3Test(BaseTest):
fixtureDB = True
runCmd = "aptly mirror show --with-packages wheezy-contrib"
def outputMatchPrepare(_, s):
def outputMatchPrepare(self, s):
return re.sub(r"Last update: [0-9:+A-Za-z -]+\n", "", s)
@@ -34,9 +34,9 @@ class ShowMirror4Test(BaseTest):
show mirror: mirror with filter
"""
fixtureCmds = [
"aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ wheezy/updates main"
"aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ stretch/updates main"
]
runCmd = "aptly mirror show mirror4"
def outputMatchPrepare(_, s):
def outputMatchPrepare(self, s):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)