diff --git a/boottest.py b/boottest.py index 2f72e9e..28cb17c 100644 --- a/boottest.py +++ b/boottest.py @@ -171,7 +171,7 @@ class BootTest(object): aptroot: ~/.chdist/%s-proposed-armhf/ apturi: file:%s/mirror/%s components: main restricted universe multiverse - rsync_host: rsync://tachash.ubuntu-ci/adt/ + rsync_host: rsync://tachash.ubuntu-ci/boottest/ datadir: ~/proposed-migration/boottest/data""" % (self.series, self.series, home, self.distribution)), file=rc_file) @@ -186,7 +186,10 @@ class BootTest(object): self.script_path, "-c", self.rc_path, "-r", self.series, + "-PU", ] + if self.debug: + command.append("-d") command.extend(args) return subprocess.check_output(command).strip() @@ -239,6 +242,13 @@ class BootTest(object): """Collects boottests results and updates internal registry.""" self._run("collect", "-O", self._result_path) 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): """Whether or not the given source and version should be tested. diff --git a/tests/test_boottest.py b/tests/test_boottest.py index 3582415..4fb27b3 100644 --- a/tests/test_boottest.py +++ b/tests/test_boottest.py @@ -151,6 +151,7 @@ class TestBoottestEnd2End(TestBase): self.create_manifest([ 'green 1.0', 'pyqt5:armhf 1.0', + 'signon 1.0' ]) def create_manifest(self, lines): @@ -176,6 +177,7 @@ template = """ green 1.1~beta RUNNING pyqt5-src 1.1~beta PASS pyqt5-src 1.1 FAIL +signon 1.1 PASS """ def request(): @@ -195,6 +197,9 @@ def collect(): p = argparse.ArgumentParser() p.add_argument('-r') 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() @@ -263,11 +268,10 @@ args.func() # promotion. context = [] context.append( - ('pyqt5', {'Source': 'pyqt5-src', 'Version': '1.1~beta', - 'Architecture': 'all'})) + ('signon', {'Version': '1.1', 'Architecture': 'armhf'})) self.do_test( context, - [r'\bpyqt5-src\b.*\(- to .*>1.1~beta<', + [r'\bsignon\b.*\(- to .*>1.1<', '