Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-10 05:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autopkgtest: Make has_autodep8 a class method

Browse Source 
So that we can use it without having to instantiate a full AutoPackageTest
object.
This commit is contained in:
Martin Pitt 2015-10-19 12:01:32 +02:00
parent 327361bd04
commit 0e3434ddbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autopkgtest.py
View File

@ -121,16 +121,18 @@ class AutoPackageTest(object):
def log_error(self, msg):
print('E: [%s] - %s' % (time.asctime(), msg))
def has_autodep8(self, srcinfo):
@classmethod
def has_autodep8(kls, srcinfo, binaries):
'''Check if package is covered by autodep8
srcinfo is an item from self.britney.sources
binaries is self.britney.binaries['unstable'][arch][0]
'''
# DKMS: some binary depends on "dkms"
for bin_arch in srcinfo[BINARIES]:
binpkg = bin_arch.split('/')[0] # chop off arch
try:
bininfo = self.britney.binaries['unstable']['amd64'][0][binpkg]
bininfo = binaries[binpkg]
except KeyError:
continue
if 'dkms' in (bininfo[DEPENDS] or ''):
@ -186,7 +188,7 @@ class AutoPackageTest(object):
srcinfo = sources_info[src]
# we want to test the package itself, if it still has a test in
# unstable
if srcinfo[AUTOPKGTEST] or self.has_autodep8(srcinfo):
if srcinfo[AUTOPKGTEST] or self.has_autodep8(srcinfo, binaries_info):
reported_pkgs.add(src)
tests.append((src, ver))
@ -227,7 +229,7 @@ class AutoPackageTest(object):
continue
else:
rdep_src_info = sources_info[rdep_src]
if rdep_src_info[AUTOPKGTEST] or self.has_autodep8(rdep_src_info):
if rdep_src_info[AUTOPKGTEST] or self.has_autodep8(rdep_src_info, binaries_info):
if rdep_src not in reported_pkgs:
tests.append((rdep_src, rdep_src_info[VERSION]))
reported_pkgs.add(rdep_src)