Merge lp:~veebers/autopilot/application_launcher_exception_not_exit into lp:autopilot

[Christopher Lee]

autopilot.introspection get_application_launcher potentially calls exit(1) if it fails to detect the application launcher.
This shouldn't exit but do something else (probably raise an exception?).

Change autopilot.introspection get_application_launcher so that it doesn't exit(1) but throws an exception instead.

[lp:~veebers/autopilot/application_launcher_exception_not_exit]

169. By Christopher Lee on 2013-04-22

Update tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/autopilot-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/30
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/30/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/autopilot-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/31/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/introspection/__init__.py'
--- autopilot/introspection/__init__.py	2013-04-22 01:31:54 +0000
+++ autopilot/introspection/__init__.py	2013-04-22 03:51:26 +0000
@@ -50,11 +50,9 @@
     # linked executables, which we may need to fix further down the line.
     try:
         ldd_output = subprocess.check_output(["ldd", app_path]).strip().lower()
-    except subprocess.CalledProcessError:
-        print "Error: Cannot auto-detect introspection plugin to load."
-        print "Use the '-i' argument to specify an interface."
-        exit(1) # TODO - don't exit, raise an exception, and handle it appropriately in parent code.
-    if 'libqtcore' in ldd_output:
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(e)
+    if 'libqtcore' in ldd_output or 'libqt5core' in ldd_output:
         from autopilot.introspection.qt import QtApplicationLauncher
         return QtApplicationLauncher()
     elif 'libgtk' in ldd_output:
 
=== modified file 'autopilot/tests/test_ap_apps.py'
--- autopilot/tests/test_ap_apps.py	2013-04-12 03:53:14 +0000
+++ autopilot/tests/test_ap_apps.py	2013-04-22 03:51:26 +0000
@@ -13,7 +13,6 @@
 from textwrap import dedent
 
 from autopilot.testcase import AutopilotTestCase
-from autopilot.introspection.gtk import GtkApplicationLauncher
 
 
 class ApplicationTests(AutopilotTestCase):
@@ -97,6 +96,11 @@
         except subprocess.CalledProcessError:
             self.skip("gnome-mahjongg not found.")
 
+    def pick_app_launcher(self, app_path):
+        # force Gtk app introspection:
+        from autopilot.introspection.gtk import GtkApplicationLauncher
+        return GtkApplicationLauncher()
+
     def test_can_launch_gtk_app(self):
         app_proxy = self.launch_test_application(self.app_path)
         self.assertTrue(app_proxy is not None)
 
=== modified file 'autopilot/tests/test_autopilot_functional.py'
--- autopilot/tests/test_autopilot_functional.py	2013-02-21 02:44:18 +0000
+++ autopilot/tests/test_autopilot_functional.py	2013-04-22 03:51:26 +0000
@@ -594,7 +594,7 @@
 
         self.assertThat(rc, Equals(1))
         self.assertThat(stdout,
-            Contains("Error: Cannot auto-detect introspection plugin to load.\nUse the '-i' argument to specify an interface."))
+            Contains("Error detecting launcher: Command '['ldd', '/usr/bin/tzselect']' returned non-zero exit status 1\n(Perhaps use the '-i' argument to specify an interface.)\n"))
 
 
 class AutopilotVerboseFunctionalTests(AutopilotFunctionalTestsBase):
 
=== modified file 'bin/autopilot'
--- bin/autopilot	2013-04-12 03:53:14 +0000
+++ bin/autopilot	2013-04-22 03:51:26 +0000
@@ -27,7 +27,7 @@
 from argparse import ArgumentParser
 from unittest.loader import TestLoader
 from unittest import TestSuite
-from autopilot.introspection import launch_application
+from autopilot.introspection import launch_application, get_application_launcher
 from autopilot.introspection.gtk import GtkApplicationLauncher
 from autopilot.introspection.qt import QtApplicationLauncher
 
@@ -347,13 +347,19 @@
     # We now have a full path to the application.
     launcher = None
     if args.interface == 'Auto':
-        launcher = get_application_introspection_base(app_name)
+        try:
+            launcher = get_application_launcher(app_name)
+        except RuntimeError as e:
+            print "Error detecting launcher: %s" % e.message
+            print "(Perhaps use the '-i' argument to specify an interface.)"
+            exit(1)
     elif args.interface == 'Gtk':
         launcher = GtkApplicationLauncher()
     elif args.interface == 'Qt':
         launcher = QtApplicationLauncher()
     if launcher is None:
         print "Error: Could not determine introspection type to use for application '%s'." % app_name
+        print "(Perhaps use the '-i' argument to specify an interface.)"
         exit(1)
 
     try:
@@ -363,28 +369,6 @@
         exit(1)
 
 
-def get_application_introspection_base(app_path):
-    """Return a base class that knows how to enable introspection for this app,
-    or None.
-
-    """
-    # TODO: this is a teeny bit hacky - we call ldd to check whether this application
-    # links to certain library. We're assuming that linking to libQt* or libGtk*
-    # means the application is introspectable. This excludes any non-dynamically
-    # linked executables, which we may need to fix further down the line.
-    try:
-        ldd_output = subprocess.check_output(["ldd", app_path]).strip().lower()
-    except subprocess.CalledProcessError:
-        print "Error: Cannot auto-detect introspection plugin to load."
-        print "Use the '-i' argument to specify an interface."
-        exit(1)
-    if 'libqtcore' in ldd_output:
-        return QtApplicationLauncher
-    elif 'libgtk' in ldd_output:
-        return GtkApplicationLauncher
-    return None
-
-
 def run_vis(args):
     setup_logging(args.verbose)
     # importing this requires that DISPLAY is set. Since we don't always want