Merge lp:~veebers/autopilot/fix-launch_dir-arg_1331270 into lp:autopilot

[Christopher Lee]

Reverted NormalApplicationLauncher's launch arg to be launch_dir not cwd.

Revert a recent change where a named arg was changed from launch_dir to cwd.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/autopilot-ci/745/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1064/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6818
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8612

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

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-autolanding/248/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1349/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2014-06-17 04:25:28 +0000
+++ autopilot/application/_launcher.py	2014-06-18 23:47:15 +0000
@@ -289,7 +289,7 @@
     """Fixture to manage launching an application."""
     __doc__ += ApplicationLauncher.__doc__
 
-    def launch(self, application, arguments=[], app_type=None, cwd=None,
+    def launch(self, application, arguments=[], app_type=None, launch_dir=None,
                capture_output=True):
         """Launch an application and return a proxy object.
 
@@ -377,7 +377,7 @@
         app_path, arguments = self._setup_environment(
             app_path, app_type, arguments)
         process = self._launch_application_process(
-            app_path, capture_output, cwd, arguments)
+            app_path, capture_output, launch_dir, arguments)
         proxy_object = get_proxy_object_for_existing_process(
             dbus_bus=self.dbus_bus,
             emulator_base=self.proxy_base,