Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-14 15:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop announcing skipped boottest attempts.

Browse Source
This commit is contained in:
Celso Providelo 2015-02-10 13:49:43 -05:00
parent a80a1e4f1c
commit 011aa3570e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boottest.py
View File

@ -127,11 +127,10 @@ class BootTest(object):
This class provides an API for handling the boottest-jenkins This class provides an API for handling the boottest-jenkins
integration layer (mostly derived from auto-package-testing/adt): integration layer (mostly derived from auto-package-testing/adt):
""" """
VALID_STATUSES = ('PASS', 'SKIPPED') VALID_STATUSES = ('PASS',)
EXCUSE_LABELS = { EXCUSE_LABELS = {
"PASS": '<span style="background:#87d96c">Pass</span>', "PASS": '<span style="background:#87d96c">Pass</span>',
"SKIPPED": '<span style="background:#e5c545">Skipped</span>',
"FAIL": '<span style="background:#ff6666">Regression</span>', "FAIL": '<span style="background:#ff6666">Regression</span>',
"RUNNING": '<span style="background:#99ddff">Test in progress</span>', "RUNNING": '<span style="background:#99ddff">Test in progress</span>',
} }

3
britney.py
View File

@ -1932,8 +1932,7 @@ class Britney(object):
# Only sources whitelisted in the boottest context should # Only sources whitelisted in the boottest context should
# be tested (currently only sources building phone binaries). # be tested (currently only sources building phone binaries).
if not boottest.needs_test(excuse.name, excuse.ver[1]): if not boottest.needs_test(excuse.name, excuse.ver[1]):
label = BootTest.EXCUSE_LABELS.get('SKIPPED') # Silently skipping.
excuse.addhtml("Boottest result: %s" % (label))
continue continue
# Okay, aggregate required boottests requests. # Okay, aggregate required boottests requests.
boottest_excuses.append(excuse) boottest_excuses.append(excuse)

8
tests/test_boottest.py
View File

@ -352,7 +352,7 @@ args.func()
def test_skipped_not_on_phone(self): def test_skipped_not_on_phone(self):
# `Britney` updates boottesting information in excuses when the # `Britney` updates boottesting information in excuses when the
# package was skipped and marks the package as a valid candidate for # package was skipped and marks the package as a valid candidate for
# promotion. # promotion, but no notice about 'boottest' is added to the excuse.
context = [] context = []
context.append( context.append(
('apache2', {'Source': 'apache2-src', 'Architecture': 'all', ('apache2', {'Source': 'apache2-src', 'Architecture': 'all',
@ -360,9 +360,9 @@ args.func()
self.do_test( self.do_test(
context, context,
[r'\bapache2-src\b.*\(- to .*>2.4.8-1ubuntu1<', [r'\bapache2-src\b.*\(- to .*>2.4.8-1ubuntu1<',
'<li>Boottest result: {}'.format( '<li>Valid candidate'],
boottest.BootTest.EXCUSE_LABELS['SKIPPED']), ['<li>Boottest result:'],
'<li>Valid candidate']) )
def test_skipped_architecture_not_allowed(self): def test_skipped_architecture_not_allowed(self):
# `Britney` does not trigger boottests for source not yet built on # `Britney` does not trigger boottests for source not yet built on