Merge lp:~aacid/autopilot/add_wait_for_proxy_upstart_launcher into lp:autopilot

[Albert Astals Cid]

Add the possibility of not waiting for the proxy of the launched app

this is useful when launching an app that we know it has already been launched and is now suspended

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:569
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/60/console

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/autopilot/add_wait_for_proxy_upstart_launcher]

570. By Albert Astals Cid on 2015-08-20

flake8++

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:570
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/62/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3814
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3811/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22719

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

review: Approve (continuous-integration)

[Christopher Lee (veebers)]

I don't think I understand, what's the intention of launching an application that is already launched, is suspended and we don't care about the proxy object?

review: Needs Information

[Albert Astals Cid (aacid)]

The intention of launching an application that is already launched is that to verify that it will be brought up to the front of the application stack on unity8 (i.e. it will become the focused application).

We don't care about the proxy object because:
a) I already have it since i already laucnhed it
b) as said since it's launched and non focused, it is suspended and thus will never answer to dbus

[Christopher Lee (veebers)]

Ok I understand why you want this now.

Are you unable to launch the app by interacting with unity (i.e. clicking on the app icon) because that's all mocked out during your test?

Regarding the code changes, you need to add additional documentation to the docstring covering what 'wait_for_proxy' is and what it is for. Perhaps a better name than wait_for_proxy would be 'return_proxy'. You need to make sure it's clear if pass False then None is returned instead.

review: Needs Fixing

[lp:~aacid/autopilot/add_wait_for_proxy_upstart_launcher]

571. By Albert Astals Cid on 2015-09-01

Rename param and document it

[Albert Astals Cid (aacid)]

> Are you unable to launch the app by interacting with unity (i.e. clicking on the app icon)
> because that's all mocked out during your test?

I could probably launch the program doing something different, but I'm trying to modify our unit test that was working fine in the past as less as possible, I don't think it's good practice for layers to break a working unit test and then ask for it to be changed.

> Regarding the code changes, you need to add additional documentation to the
> docstring covering what 'wait_for_proxy' is and what it is for. Perhaps a
> better name than wait_for_proxy would be 'return_proxy'. You need to make
> sure it's clear if pass False then None is returned instead.

Ok, done

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/64/console

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/autopilot/add_wait_for_proxy_upstart_launcher]

572. By Albert Astals Cid on 2015-09-01

flake..

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:572
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1135/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/65/console

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/autopilot/add_wait_for_proxy_upstart_launcher]

573. By Albert Astals Cid on 2015-09-01

flake

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:573
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/66/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3920
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3917
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22944

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Chris prefers https://code.launchpad.net/~canonical-platform-qa/autopilot/launcher-for-already-launched/+merge/269836

Unmerged revisions

573. By Albert Astals Cid on 2015-09-01

flake

572. By Albert Astals Cid on 2015-09-01

flake..

571. By Albert Astals Cid on 2015-09-01

Rename param and document it

570. By Albert Astals Cid on 2015-08-20

flake8++

569. By Albert Astals Cid on 2015-08-19

Add the possibility of not waiting for the proxy of the launched app

this is useful when launching an app that we know it has already been launched and is now suspended

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2014-07-22 02:30:19 +0000
+++ autopilot/application/_launcher.py	2015-09-01 11:22:24 +0000
@@ -89,7 +89,7 @@
     Started = object()
     Stopped = object()
 
-    def launch(self, app_id, app_uris=[]):
+    def launch(self, app_id, app_uris=[], return_proxy=True):
         """Launch an application with upstart.
 
         This method launches an application via the ``upstart-app-launch``
@@ -140,12 +140,15 @@
             state.get('message', '')
         )
         pid = self._get_pid_for_launched_app(app_id)
-        proxy_object = get_proxy_object_for_existing_process(
-            dbus_bus=self.dbus_bus,
-            emulator_base=self.proxy_base,
-            pid=pid
-        )
-        return proxy_object
+        if return_proxy:
+            proxy_object = get_proxy_object_for_existing_process(
+                dbus_bus=self.dbus_bus,
+                emulator_base=self.proxy_base,
+                pid=pid
+            )
+            return proxy_object
+        else:
+            return None
 
     @staticmethod
     def _on_failed(launched_app_id, failure_type, state):

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2015-08-19 03:34:47 +0000
+++ autopilot/testcase.py	2015-09-01 11:22:24 +0000
@@ -328,7 +328,8 @@
         )
         return launcher.launch(package_id, app_name, app_uris)
 
-    def launch_upstart_application(self, application_name, uris=[], **kwargs):
+    def launch_upstart_application(self, application_name, uris=[],
+                                   return_proxy=True, **kwargs):
         """Launch an application with upstart.
 
         This method launched an application via the ``ubuntu-app-launch``
@@ -340,6 +341,8 @@
             app_proxy = self.launch_upstart_application("gallery-app")
 
         :param application_name: The name of the application to launch.
+        :param return_proxy: If set, the call will return the dbus proxy for
+            the application, otherwise will be None
         :keyword emulator_base: If set, specifies the base class to be used for
             all emulators for this loaded application.
 
@@ -351,7 +354,7 @@
                 **kwargs
             )
         )
-        return launcher.launch(application_name, uris)
+        return launcher.launch(application_name, uris, return_proxy)
 
     def _compare_system_with_app_snapshot(self):
         """Compare the currently running application with the last snapshot.