vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-10 06:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Add system's requirements.txt, enforce flake8 linter

Browse Source 
Fix style issues in functional tests.
This commit is contained in:
Andrey Smirnov
2017-04-27 18:58:15 +03:00
parent 7a7b981d4f
commit c798db8056
44 changed files with 334 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t04_mirror/create.py
+30 -11
View File
@@ -92,7 +92,9 @@ class CreateMirror9Test(BaseTest):
"""
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror9 http://mirror.yandex.ru/debian/ wheezy-backports"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|Warning: using insecure memory!\n', '', s)
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using|Warning: using insecure memory!\n', '', s)
def check(self):
def removeDates(s):
@@ -109,9 +111,11 @@ class CreateMirror10Test(BaseTest):
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://mirror.yandex.ru/debian-backports/ squeeze-backports"
fixtureGpg = False
gold_processor = BaseTest.expand_environ
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE)
expectedCode = 1
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE)
class CreateMirror11Test(BaseTest):
"""
@@ -119,7 +123,9 @@ class CreateMirror11Test(BaseTest):
"""
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ wheezy"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
def check(self):
self.check_output()
@@ -133,9 +139,11 @@ class CreateMirror12Test(BaseTest):
runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://mirror.yandex.ru/debian/ wheezy"
fixtureGpg = False
gold_processor = BaseTest.expand_environ
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE)
expectedCode = 1
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using|gpgv: keyblock resource .*$|gpgv: Can\'t check signature: .*$', '', s, flags=re.MULTILINE)
class CreateMirror13Test(BaseTest):
"""
@@ -155,7 +163,9 @@ class CreateMirror14Test(BaseTest):
"""
runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror14 https://cloud.r-project.org/bin/linux/debian jessie-cran3/"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
def check(self):
self.check_output()
@@ -195,8 +205,6 @@ class CreateMirror18Test(BaseTest):
create mirror: mirror with ppa URL
"""
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
configOverride = {
"ppaDistributorID": "ubuntu",
"ppaCodename": "maverick",
@@ -204,6 +212,9 @@ class CreateMirror18Test(BaseTest):
runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror18 ppa:gladky-anton/gnuplot"
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
def check(self):
self.check_output()
self.check_cmd_output("aptly mirror show mirror18", "mirror_show")
@@ -214,10 +225,12 @@ class CreateMirror19Test(BaseTest):
create mirror: mirror with / in distribution
"""
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://security.debian.org/ wheezy/updates main"
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
def check(self):
def removeDates(s):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
@@ -231,12 +244,14 @@ class CreateMirror20Test(BaseTest):
create mirror: using failing HTTP_PROXY
"""
fixtureGpg = True
outputMatchPrepare = lambda _, s: s.replace('getsockopt: ', '').replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ wheezy/updates main"
environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"}
expectedCode = 1
def outputMatchPrepare(_, s):
return s.replace('getsockopt: ', '').replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137')
class CreateMirror21Test(BaseTest):
"""
@@ -244,7 +259,9 @@ class CreateMirror21Test(BaseTest):
"""
runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror21 http://pkg.jenkins-ci.org/debian-stable binary/"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
def check(self):
def removeSHA512(s):
@@ -285,7 +302,9 @@ class CreateMirror24Test(BaseTest):
"""
runCmd = "aptly mirror create -ignore-signatures=false -keyring=aptlytest.gpg mirror24 http://security.debian.org/ wheezy/updates main"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def outputMatchPrepare(_, s):
return re.sub(r'Signature made .* using', '', s)
configOverride = {
"gpgDisableVerify": True