Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-25 17:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Boottest integration adjustments.

Browse Source
This commit is contained in:
Celso Providelo 2015-02-06 11:43:38 -05:00
commit a80a1e4f1c
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boottest.py
View File

@ -171,7 +171,7 @@ class BootTest(object):
aptroot: ~/.chdist/%s-proposed-armhf/ aptroot: ~/.chdist/%s-proposed-armhf/
apturi: file:%s/mirror/%s apturi: file:%s/mirror/%s
components: main restricted universe multiverse components: main restricted universe multiverse
rsync_host: rsync://tachash.ubuntu-ci/adt/ rsync_host: rsync://tachash.ubuntu-ci/boottest/
datadir: ~/proposed-migration/boottest/data""" % datadir: ~/proposed-migration/boottest/data""" %
(self.series, self.series, home, self.distribution)), (self.series, self.series, home, self.distribution)),
file=rc_file) file=rc_file)
@ -186,7 +186,10 @@ class BootTest(object):
self.script_path, self.script_path,
"-c", self.rc_path, "-c", self.rc_path,
"-r", self.series, "-r", self.series,
"-PU",
] ]
if self.debug:
command.append("-d")
command.extend(args) command.extend(args)
return subprocess.check_output(command).strip() return subprocess.check_output(command).strip()
@ -239,6 +242,13 @@ class BootTest(object):
"""Collects boottests results and updates internal registry.""" """Collects boottests results and updates internal registry."""
self._run("collect", "-O", self._result_path) self._run("collect", "-O", self._result_path)
self._read() self._read()
if not self.britney.options.verbose:
return
for src in sorted(self.pkglist):
for ver in sorted(self.pkglist[src], cmp=apt_pkg.version_compare):
status = self.pkglist[src][ver]
print("I: [%s] - Collected boottest status for %s_%s: "
"%s" % (time.asctime(), src, ver, status))
def needs_test(self, name, version): def needs_test(self, name, version):
"""Whether or not the given source and version should be tested. """Whether or not the given source and version should be tested.

10
tests/test_boottest.py
View File

@ -151,6 +151,7 @@ class TestBoottestEnd2End(TestBase):
self.create_manifest([ self.create_manifest([
'green 1.0', 'green 1.0',
'pyqt5:armhf 1.0', 'pyqt5:armhf 1.0',
'signon 1.0'
]) ])
def create_manifest(self, lines): def create_manifest(self, lines):
@ -176,6 +177,7 @@ template = """
green 1.1~beta RUNNING green 1.1~beta RUNNING
pyqt5-src 1.1~beta PASS pyqt5-src 1.1~beta PASS
pyqt5-src 1.1 FAIL pyqt5-src 1.1 FAIL
signon 1.1 PASS
""" """
def request(): def request():
@ -195,6 +197,9 @@ def collect():
p = argparse.ArgumentParser() p = argparse.ArgumentParser()
p.add_argument('-r') p.add_argument('-r')
p.add_argument('-c') p.add_argument('-c')
p.add_argument('-d', default=False, action='store_true')
p.add_argument('-P', default=False, action='store_true')
p.add_argument('-U', default=False, action='store_true')
sp = p.add_subparsers() sp = p.add_subparsers()
@ -263,11 +268,10 @@ args.func()
# promotion. # promotion.
context = [] context = []
context.append( context.append(
('pyqt5', {'Source': 'pyqt5-src', 'Version': '1.1~beta', ('signon', {'Version': '1.1', 'Architecture': 'armhf'}))
'Architecture': 'all'}))
self.do_test( self.do_test(
context, context,
[r'\bpyqt5-src\b.*\(- to .*>1.1~beta<', [r'\bsignon\b.*\(- to .*>1.1<',
'<li>Boottest result: {}'.format( '<li>Boottest result: {}'.format(
boottest.BootTest.EXCUSE_LABELS['PASS']), boottest.BootTest.EXCUSE_LABELS['PASS']),
'<li>Valid candidate']) '<li>Valid candidate'])