mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-02-13 15:37:02 +00:00
Add structured test results to Excuse objects
Add Excuse.addtest() for adding a test type/package/arch/result, so that the excuses YAML will get structured test results instead of pre-formatted HTML. Move the HTML rendering into Excuse.html() instead. This supports a "test type" whose only value is "autopkgtest" right now, but we will have "bootest", perhaps "piuparts" and other tests in the future. Drop the "(<ver> is unbuilt/uninstallable)" note from excuses.html as this is really a per-architecture property, not a per-tested-source one. This needs to be re-thought and generalized.
This commit is contained in:
Martin Pitt
parent
66f6a066d2
commit
71b07bc66a
@ -32,14 +32,6 @@ import kombu
|
||||
from consts import (AUTOPKGTEST, BINARIES, DEPENDS, RDEPENDS, SOURCE, VERSION)
|
||||
|
||||
|
||||
ADT_EXCUSES_LABELS = {
|
||||
"PASS": '<span style="background:#87d96c">Pass</span>',
|
||||
"ALWAYSFAIL": '<span style="background:#e5c545">Always failed</span>',
|
||||
"REGRESSION": '<span style="background:#ff6666">Regression</span>',
|
||||
"RUNNING": '<span style="background:#99ddff">Test in progress</span>',
|
||||
}
|
||||
|
||||
|
||||
def srchash(src):
|
||||
'''archive hash prefix for source package'''
|
||||
|
||||
|
||||
14
britney.py
14
britney.py
@ -212,7 +212,7 @@ from britney_util import (old_libraries_format, same_source, undo_changes,
|
||||
from consts import (VERSION, SECTION, BINARIES, MAINTAINER, FAKESRC,
|
||||
SOURCE, SOURCEVER, ARCHITECTURE, DEPENDS, CONFLICTS,
|
||||
PROVIDES, RDEPENDS, RCONFLICTS, MULTIARCH, ESSENTIAL)
|
||||
from autopkgtest import AutoPackageTest, ADT_EXCUSES_LABELS, srchash
|
||||
from autopkgtest import AutoPackageTest, srchash
|
||||
from boottest import BootTest
|
||||
|
||||
|
||||
@ -1909,17 +1909,11 @@ class Britney(object):
|
||||
adtpass = True
|
||||
for passed, adtsrc, adtver, arch_status in autopkgtest.results(
|
||||
e.name, e.ver[1]):
|
||||
archmsg = []
|
||||
for arch in sorted(arch_status):
|
||||
for arch in arch_status:
|
||||
url = cloud_url % {'h': srchash(adtsrc), 's': adtsrc,
|
||||
'r': self.options.series, 'a': arch}
|
||||
archmsg.append('<a href="%s">%s: %s</a>' %
|
||||
(url, arch, ADT_EXCUSES_LABELS[arch_status[arch]]))
|
||||
if adtsrc in autopkgtest_excludes:
|
||||
note = ' (%s is unbuilt/uninstallable)' % self.sources['unstable'][adtsrc][VERSION]
|
||||
else:
|
||||
note = ''
|
||||
e.addhtml('autopkgtest for %s %s%s: %s' % (adtsrc, adtver, note, ', '.join(archmsg)))
|
||||
e.addtest('autopkgtest', '%s %s' % (adtsrc, adtver),
|
||||
arch, arch_status[arch], url)
|
||||
|
||||
# hints can override failures
|
||||
if not passed:
|
||||
|
||||
26
excuse.py
26
excuse.py
@ -16,6 +16,15 @@
|
||||
|
||||
import re
|
||||
|
||||
EXCUSES_LABELS = {
|
||||
"PASS": '<span style="background:#87d96c">Pass</span>',
|
||||
"FAIL": '<span style="background:#ff6666">Failed</span>',
|
||||
"ALWAYSFAIL": '<span style="background:#e5c545">Always failed</span>',
|
||||
"REGRESSION": '<span style="background:#ff6666">Regression</span>',
|
||||
"RUNNING": '<span style="background:#99ddff">Test in progress</span>',
|
||||
}
|
||||
|
||||
|
||||
class Excuse(object):
|
||||
"""Excuse class
|
||||
|
||||
@ -62,6 +71,9 @@ class Excuse(object):
|
||||
self.oldbugs = set()
|
||||
self.reason = {}
|
||||
self.htmlline = []
|
||||
# type (e. g. "autopkgtest") -> package (e. g. "foo 2-1") -> arch ->
|
||||
# ['PASS'|'ALWAYSFAIL'|'REGRESSION'|'RUNNING', url]
|
||||
self.tests = {}
|
||||
|
||||
def sortkey(self):
|
||||
if self.daysold == None:
|
||||
@ -165,6 +177,15 @@ class Excuse(object):
|
||||
else:
|
||||
res = res + ("<li>%d days old (needed %d days)\n" %
|
||||
(self.daysold, self.mindays))
|
||||
for testtype in sorted(self.tests):
|
||||
for pkg in sorted(self.tests[testtype]):
|
||||
archmsg = []
|
||||
for arch in sorted(self.tests[testtype][pkg]):
|
||||
status, url = self.tests[testtype][pkg][arch]
|
||||
archmsg.append('<a href="%s">%s: %s</a>' %
|
||||
(url, arch, EXCUSES_LABELS[status]))
|
||||
res = res + ("<li>%s for %s: %s</li>\n" % (testtype, pkg, ', '.join(archmsg)))
|
||||
|
||||
for x in self.htmlline:
|
||||
res = res + "<li>" + x + "\n"
|
||||
lastdep = ""
|
||||
@ -193,6 +214,10 @@ class Excuse(object):
|
||||
""""adding reason"""
|
||||
self.reason[reason] = 1
|
||||
|
||||
def addtest(self, type_, package, arch, state, url):
|
||||
"""Add test result"""
|
||||
self.tests.setdefault(type_, {}).setdefault(package, {})[arch] = [state, url]
|
||||
|
||||
# TODO merge with html()
|
||||
def text(self):
|
||||
"""Render the excuse in text"""
|
||||
@ -248,5 +273,6 @@ class Excuse(object):
|
||||
else:
|
||||
excusedata["reason"] = list(self.reason.keys())
|
||||
excusedata["is-candidate"] = self.is_valid
|
||||
excusedata["tests"] = self.tests
|
||||
return excusedata
|
||||
|
||||
|
||||
@ -385,7 +385,7 @@ lightgreen 1 i386 green 2
|
||||
r'\blightgreen\b.*>1</a> to .*>2<',
|
||||
r'autopkgtest for green 2: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for darkgreen 1: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for lightgreen 1 \(2 is unbuilt/uninstallable\): .*amd64.*Regression.*i386.*Regression',
|
||||
r'autopkgtest for lightgreen 1: .*amd64.*Regression.*i386.*Regression',
|
||||
r'lightgreen has no up-to-date binaries on any arch'],
|
||||
['Valid candidate'])
|
||||
|
||||
@ -483,7 +483,7 @@ lightgreen 1 i386 green 2
|
||||
r'\blightgreen\b.*>1</a> to .*>2<',
|
||||
r'autopkgtest for green 2: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for darkgreen 1: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for lightgreen 1 \(2 is unbuilt/uninstallable\): .*amd64.*Regression.*i386.*Regression',
|
||||
r'autopkgtest for lightgreen 1: .*amd64.*Regression.*i386.*Regression',
|
||||
r'lightgreen has no up-to-date binaries on any arch'],
|
||||
['Valid candidate'])
|
||||
self.assertEqual(
|
||||
@ -528,7 +528,7 @@ lightgreen 1 i386 green 2
|
||||
r'\blightgreen\b.*>1</a> to .*>2<',
|
||||
r'autopkgtest for green 2: .*amd64.*in progress.*i386.*in progress',
|
||||
r'autopkgtest for darkgreen 1: .*amd64.*in progress.*i386.*in progress',
|
||||
r'autopkgtest for lightgreen 1 \(2 is unbuilt/uninstallable\): .*amd64.*in progress.*i386.*in progress',
|
||||
r'autopkgtest for lightgreen 1: .*amd64.*in progress.*i386.*in progress',
|
||||
r'lightgreen has no up-to-date binaries on any arch'],
|
||||
['Valid candidate'])
|
||||
self.assertEqual(
|
||||
@ -555,7 +555,7 @@ lightgreen 1 i386 green 2
|
||||
r'\blightgreen\b.*>1</a> to .*>2<',
|
||||
r'autopkgtest for green 2: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for darkgreen 1: .*amd64.*Pass.*i386.*Pass',
|
||||
r'autopkgtest for lightgreen 2 \(2 is unbuilt/uninstallable\): .*amd64.*Regression.*i386.*Regression',
|
||||
r'autopkgtest for lightgreen 2: .*amd64.*Regression.*i386.*Regression',
|
||||
r'lightgreen has no up-to-date binaries on any arch'],
|
||||
['Valid candidate'])
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user