Merge lp:~cprov/britney/boottesting-no-skip-notice into lp:~canonical-ci-engineering/britney/boottesting-support

[Celso Providelo]

Stop updating excuses for SKIPPED boottest attempts (noise reduction).

[Francis Ginther (fginther)]

Approved

review: Approve

=== modified file 'boottest.py'
--- boottest.py	2015-02-06 16:43:38 +0000
+++ boottest.py	2015-02-10 18:54:20 +0000
@@ -127,11 +127,10 @@
     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": '<span style="background:#87d96c">Pass</span>',
-        "SKIPPED": '<span style="background:#e5c545">Skipped</span>',
         "FAIL": '<span style="background:#ff6666">Regression</span>',
         "RUNNING": '<span style="background:#99ddff">Test in progress</span>',
     }

=== modified file 'britney.py'
--- britney.py	2015-02-06 15:38:36 +0000
+++ britney.py	2015-02-10 18:54:20 +0000
@@ -1932,8 +1932,7 @@
                 # 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)

=== modified file 'tests/test_boottest.py'
--- tests/test_boottest.py	2015-02-06 16:43:38 +0000
+++ tests/test_boottest.py	2015-02-10 18:54:20 +0000
@@ -352,7 +352,7 @@
     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 @@
         self.do_test(
             context,
             [r'\bapache2-src\b.*\(- to .*>2.4.8-1ubuntu1<',
-             '<li>Boottest result: {}'.format(
-                 boottest.BootTest.EXCUSE_LABELS['SKIPPED']),
-             '<li>Valid candidate'])
+             '<li>Valid candidate'],
+            ['<li>Boottest result:'],
+        )
 
     def test_skipped_architecture_not_allowed(self):
         # `Britney` does not trigger boottests for source not yet built on