From 011aa3570e4f36d4e918d9e147a5003c3645b492 Mon Sep 17 00:00:00 2001 From: Celso Providelo Date: Tue, 10 Feb 2015 13:49:43 -0500 Subject: [PATCH] Stop announcing skipped boottest attempts. --- boottest.py | 3 +-- britney.py | 3 +-- tests/test_boottest.py | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/boottest.py b/boottest.py index 28cb17c..0effc50 100644 --- a/boottest.py +++ b/boottest.py @@ -127,11 +127,10 @@ class BootTest(object): This class provides an API for handling the boottest-jenkins integration layer (mostly derived from auto-package-testing/adt): """ - VALID_STATUSES = ('PASS', 'SKIPPED') + VALID_STATUSES = ('PASS',) EXCUSE_LABELS = { "PASS": 'Pass', - "SKIPPED": 'Skipped', "FAIL": 'Regression', "RUNNING": 'Test in progress', } diff --git a/britney.py b/britney.py index eef23fe..d81b9e9 100755 --- a/britney.py +++ b/britney.py @@ -1932,8 +1932,7 @@ class Britney(object): # Only sources whitelisted in the boottest context should # be tested (currently only sources building phone binaries). if not boottest.needs_test(excuse.name, excuse.ver[1]): - label = BootTest.EXCUSE_LABELS.get('SKIPPED') - excuse.addhtml("Boottest result: %s" % (label)) + # Silently skipping. continue # Okay, aggregate required boottests requests. boottest_excuses.append(excuse) diff --git a/tests/test_boottest.py b/tests/test_boottest.py index 4fb27b3..53b70c1 100644 --- a/tests/test_boottest.py +++ b/tests/test_boottest.py @@ -352,7 +352,7 @@ args.func() def test_skipped_not_on_phone(self): # `Britney` updates boottesting information in excuses when the # 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.append( ('apache2', {'Source': 'apache2-src', 'Architecture': 'all', @@ -360,9 +360,9 @@ args.func() self.do_test( context, [r'\bapache2-src\b.*\(- to .*>2.4.8-1ubuntu1<', - '
  • Boottest result: {}'.format( - boottest.BootTest.EXCUSE_LABELS['SKIPPED']), - '
  • Valid candidate']) + '
  • Valid candidate'], + ['
  • Boottest result:'], + ) def test_skipped_architecture_not_allowed(self): # `Britney` does not trigger boottests for source not yet built on