Merge lp:~thomir-deactivatedaccount/autopilot/fix-for-1171303 into lp:autopilot

[Thomi Richards]

Fix exception formatting.

This branch fixes two separate, yet related issues:
 * When launching an aplication for introspection, if the introspection type cannot be determined, autopilot rauses a RuntimeException. The string formatting in the exceptions message was bad (it contained lots of whitesapce).
 * When launching an aplication for introspection, passing a non-dynamically linked executable would raise a RuntimeError, but with the wrong message.

[lp:~thomir-deactivatedaccount/autopilot/fix-for-1171303]

170. By Thomi Richards on 2013-04-23

Fixed more tests.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Christopher Lee (veebers)]

looks good.

review: Approve

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2013-04-22 05:06:14 +0000
+++ autopilot/testcase.py	2013-04-23 04:02:27 +0000
@@ -258,11 +258,15 @@
         """
         app_path = subprocess.check_output(['which',application]).strip()
         # Get a launcher, tests can override this if they need:
-        launcher = self.pick_app_launcher(app_path)
+        launcher = None
+        try:
+            launcher = self.pick_app_launcher(app_path)
+        except RuntimeError:
+            pass
         if launcher is None:
             raise RuntimeError("Autopilot could not determine the correct \
-                introspection type to use. You can specify one by overriding \
-                the AutopilotTestCase.pick_app_launcher method.")
+introspection type to use. You can specify one by overriding the \
+AutopilotTestCase.pick_app_launcher method.")
         process = launch_application(launcher, app_path, *arguments, **kwargs)
         self.addCleanup(self._kill_process_and_attach_logs, process)
         return get_autopilot_proxy_object_for_process(process)

=== modified file 'autopilot/tests/test_ap_apps.py'
--- autopilot/tests/test_ap_apps.py	2013-04-22 03:47:55 +0000
+++ autopilot/tests/test_ap_apps.py	2013-04-23 04:02:27 +0000
@@ -10,6 +10,7 @@
 import stat
 import subprocess
 from tempfile import mktemp
+from testtools.matchers import raises
 from textwrap import dedent
 
 from autopilot.testcase import AutopilotTestCase
@@ -31,6 +32,22 @@
         return path
 
 
+class ApplicationLaunchTests(ApplicationTests):
+
+    def test_unknown_app_exception(self):
+        """launch_test_app must raise a RuntimeError when asked to launch an
+        application that has an unknown introspection type.
+
+        """
+        path = self.write_script("")
+        expected_error_message = "Autopilot could not determine the correct \
+introspection type to use. You can specify one by overriding the \
+AutopilotTestCase.pick_app_launcher method."
+
+        self.assertThat(lambda: self.launch_test_application(path),
+            raises(RuntimeError(expected_error_message)))
+
+
 class QtTests(ApplicationTests):
 
     def setUp(self):