Merge lp:~fginther/phablet-tools/skip-missing-click-tests into lp:phablet-tools

[Francis Ginther]

Generate an error when copying test sources for any given click and move on to the next.

Generate an error when copying test sources for any given click and move on to the next.

The click manifest files point to a bzr branch to acquire the test sources, however, there is no mechanism to change the default location within the bzr branch or deal with test sources that may have moved do a different branch after the click package has been published. This change at least skips over these packages so that others can be installed.

[lp:~fginther/phablet-tools/skip-missing-click-tests]

340. By Francis Ginther on 2015-04-21

Fix errors.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/439/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/439/rebuild

review: Approve (continuous-integration)

[lp:~fginther/phablet-tools/skip-missing-click-tests]

341. By Francis Ginther on 2015-04-21

Add hack for downloading source packages from the overlay PPA.

[Robert Bruce Park (robru)]

Mostly looks good, some nitpicks inline.

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

A few comments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/440/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/440/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

341. By Francis Ginther on 2015-04-21

Add hack for downloading source packages from the overlay PPA.

340. By Francis Ginther on 2015-04-21

Fix errors.

339. By Francis Ginther on 2015-04-15

Add CalledProcessError handling.

338. By Francis Ginther on 2015-04-14

Ignore errors when copying test sources.

=== modified file 'phablet-click-test-setup'
--- phablet-click-test-setup	2014-09-29 16:30:56 +0000
+++ phablet-click-test-setup	2015-04-21 22:13:08 +0000
@@ -20,7 +20,7 @@
 from launchpadlib.launchpad import Launchpad
 from phabletutils.device import AndroidBridge
 from os import path
-from subprocess import (check_call, check_output)
+from subprocess import (check_call, check_output, CalledProcessError)
 
 import argparse
 import atexit
@@ -55,6 +55,10 @@
         self._series = distro.getSeries(name_or_version=release)
         self._arch_series = self._series.getDistroArchSeries(archtag=arch)
         self._archive = self.lp.distributions[distribution].main_archive
+        ppa_list = self.lp.people['ci-train-ppa-service'].ppas
+        for p in ppa_list:
+            if p.name == 'stable-phone-overlay':
+                self._ppa = p
 
 
 lp = None
@@ -157,13 +161,22 @@
     atexit.register(cleanup, tmp_dir)
     print('Fetching %s - into %s' % (package, tmp_dir))
     try:
-        sp = lp.archive.getPublishedSources(
-            source_name=package,
-            version=version,
-            distro_series=lp.series,
-            exact_match=True)
-        # TODO needs filtering
-        source_url = sp[0].sourceFileUrls()[0]
+        try:
+            sp = lp.archive.getPublishedSources(
+                source_name=package,
+                version=version,
+                distro_series=lp.series,
+                exact_match=True)
+            # TODO needs filtering
+            source_url = sp[0].sourceFileUrls()[0]
+        except IndexError as e:
+            sp = lp._ppa.getPublishedSources(
+                source_name=package,
+                version=version,
+                distro_series=lp.series,
+                exact_match=True)
+            # TODO needs filtering
+            source_url = sp[0].sourceFileUrls()[0]
         print('Downloading %s version %s from %s' % (package,
                                                      version, source_url))
         url = urllib2.urlopen(source_url)
@@ -234,10 +247,15 @@
     print('Only keeping entries with x-source')
     manifest = [entry for entry in manifest if 'x-source' in entry]
     for entry in manifest:
-        get_bzr_tests(entry['x-source']['vcs-bzr'],
-                      entry['x-source']['vcs-bzr-revno'],
-                      'tests/autopilot',
-                      test_dir)
+        try:
+            get_bzr_tests(entry['x-source']['vcs-bzr'],
+                          entry['x-source']['vcs-bzr-revno'],
+                          'tests/autopilot',
+                          test_dir)
+        except (CalledProcessError, OSError) as e:
+            print('Error: unable to acquire test sources for {}, '
+                  'continuing.'.format(entry['name']))
+            print('Error: {}'.format(e))
 
 
 def main():