mirror of
				https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
				synced 2025-11-04 10:34:05 +00:00 
			
		
		
		
	Suppress boottest SKIPPED notice on excuses, it's unnecessary noise.
This commit is contained in:
		
						commit
						496a2f3134
					
				@ -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": '<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>',
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -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)
 | 
			
		||||
 | 
			
		||||
@ -362,7 +362,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',
 | 
			
		||||
@ -370,9 +370,9 @@ args.func()
 | 
			
		||||
        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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user