Merge lp:~cprov/britney/boottest-integration-tweak into lp:~canonical-ci-engineering/britney/boottesting-support

[Celso Providelo]

Integration tweaks for the current fork of auto-package-testing project.

[Joe Talbott (joetalbott)]

LGTM - Is the plan to eventually remove at least the -U part?

review: Approve

[lp:~cprov/britney/boottest-integration-tweak]

458. By Celso Providelo on 2015-02-05

boottest-britney debug options respects BOOTTEST_DEBUG configuration option.

459. By Celso Providelo on 2015-02-05

Fix BootTest.get_status to return status for the latest known version. Boottests results are reported for the current (published) version, not the proposed one.

460. By Celso Providelo on 2015-02-06

Restore boottest status lookup by source name & version.

461. By Celso Providelo on 2015-02-06

Re-fix get_status() doc string and remove commented code.

=== modified file 'boottest.py'
--- boottest.py	2015-02-05 16:20:28 +0000
+++ boottest.py	2015-02-06 16:16:55 +0000
@@ -171,7 +171,7 @@
                 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 @@
             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 @@
         """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.

=== modified file 'tests/test_boottest.py'
--- tests/test_boottest.py	2015-02-05 22:27:39 +0000
+++ tests/test_boottest.py	2015-02-06 16:16:55 +0000
@@ -151,6 +151,7 @@
         self.create_manifest([
             'green 1.0',
             'pyqt5:armhf 1.0',
+            'signon 1.0'
         ])
 
     def create_manifest(self, lines):
@@ -176,6 +177,7 @@
 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 @@
 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 @@
         # 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<',
              '<li>Boottest result: {}'.format(
                  boottest.BootTest.EXCUSE_LABELS['PASS']),
              '<li>Valid candidate'])