Merge lp:~sergiusens/autopilot/app_uris into lp:autopilot

[Sergio Schvezov]

Adding APP_URIS parameter to Click package launching

[lp:~sergiusens/autopilot/app_uris]

412. By Sergio Schvezov on 2014-01-14

s/None/""/

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/autopilot-ci/393/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2316
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2316/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/autopilot-ci/394/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2318
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2318/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Christopher Lee (veebers)]

LGTM

review: Approve

=== modified file 'autopilot/application/_launcher.py'
--- autopilot/application/_launcher.py	2014-01-10 02:59:04 +0000
+++ autopilot/application/_launcher.py	2014-01-14 01:28:48 +0000
@@ -63,16 +63,16 @@
 
         _raise_if_not_empty(kwargs)
 
-    def launch(self, package_id, app_name):
+    def launch(self, package_id, app_name, app_uris):
         app_id = _get_click_app_id(package_id, app_name)
 
         _app_env = self.useFixture(UpstartApplicationEnvironment())
         _app_env.prepare_environment(app_id, app_name)
 
-        return self._launch_click_app(app_id)
+        return self._launch_click_app(app_id, app_uris)
 
-    def _launch_click_app(self, app_id):
-        pid = _launch_click_app(app_id)
+    def _launch_click_app(self, app_id, app_uris):
+        pid = _launch_click_app(app_id, app_uris)
         self._add_click_launch_cleanup(app_id, pid)
 
         logger.info(
@@ -169,11 +169,12 @@
     return psutil.pid_exists(pid)
 
 
-def _launch_click_app(app_id):
+def _launch_click_app(app_id, app_uris):
     subprocess.check_output([
         "/sbin/start",
         "application",
         "APP_ID={}".format(app_id),
+        "APP_URIS='{}'".format(app_uris),
     ])
 
     return _get_click_app_pid(app_id)

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2014-01-09 23:51:18 +0000
+++ autopilot/testcase.py	2014-01-14 01:28:48 +0000
@@ -256,7 +256,8 @@
 
         return self._launch_test_application(launcher, application, *arguments)
 
-    def launch_click_package(self, package_id, app_name=None, **kwargs):
+    def launch_click_package(self, package_id, app_name=None, app_uris="",
+                             **kwargs):
         """Launch a click package application with introspection enabled.
 
         This method takes care of launching a click package with introspection
@@ -275,6 +276,8 @@
         :param app_name: Currently, only one application can be packaged in a
             click package, and this parameter can be left at None. If
             specified, it should be the application name you wish to launch.
+        :param app_uris: Parameters used to launch the click package. This
+            parameter will be left empty if not used.
 
         :keyword emulator_base: If set, specifies the base class to be used for
             all emulators for this loaded application.
@@ -288,7 +291,8 @@
         launcher = self.useFixture(
             ClickApplicationLauncher(self.addDetail, **kwargs)
         )
-        return self._launch_test_application(launcher, package_id, app_name)
+        return self._launch_test_application(launcher, package_id, app_name,
+                                             app_uris)
 
     # Wrapper function tying the newer ApplicationLauncher behaviour with the
     # previous (to be depreciated) behaviour

=== modified file 'autopilot/tests/unit/test_application_launcher.py'
--- autopilot/tests/unit/test_application_launcher.py	2014-01-10 02:59:04 +0000
+++ autopilot/tests/unit/test_application_launcher.py	2014-01-14 01:28:48 +0000
@@ -185,7 +185,7 @@
             launcher.setUp()
             launcher._launch_click_app = Mock()
 
-            launcher.launch("package_id", "app_name")
+            launcher.launch("package_id", "app_name", "")
             prep_env.assert_called_with("app_id", "app_name")
 
     def test_get_click_app_id_raises_runtimeerror_on_empty_manifest(self):
@@ -293,7 +293,7 @@
 
         with patch.object(_l, 'logger'):
             self.assertThat(
-                launcher._launch_click_app("appid"),
+                launcher._launch_click_app("appid", ""),
                 Equals(123)
             )
 
@@ -408,12 +408,31 @@
         with patch.object(
             _l, '_get_click_app_pid'
         ) as patched_get_click_app_pid:
-            _launch_click_app(test_app_name)
-
-            check_output.assert_called_with([
-                "/sbin/start",
-                "application",
-                "APP_ID=%s" % test_app_name,
+            _launch_click_app(test_app_name, "")
+
+            check_output.assert_called_with([
+                "/sbin/start",
+                "application",
+                "APP_ID=%s" % test_app_name,
+                "APP_URIS=''",
+            ])
+            patched_get_click_app_pid.assert_called_with(test_app_name)
+
+    @patch('autopilot.application._launcher.subprocess.check_output')
+    def test_launch_click_app_starts_application_with_uri(self, check_output):
+        test_app_name = self.getUniqueString()
+        test_app_uris = "%s %s" % (self.getUniqueString(),
+                                   self.getUniqueString())
+        with patch.object(
+            _l, '_get_click_app_pid'
+        ) as patched_get_click_app_pid:
+            _launch_click_app(test_app_name, test_app_uris)
+
+            check_output.assert_called_with([
+                "/sbin/start",
+                "application",
+                "APP_ID=%s" % test_app_name,
+                "APP_URIS='%s'" % test_app_uris,
             ])
             patched_get_click_app_pid.assert_called_with(test_app_name)