Changes: Merge latest changes on 'master' into PR12-content

debian/changelog

@@ -9,6 +9,19 @@ applauncherd (2.0.0) unstable; urgency=low
 
  -- Alexey Shilov <alexey.shilov@nokia.com>  Thu, 18 Aug 2011 15:43:02 +0300
 
+applauncherd (1.1.1) unstable; urgency=low
+
+  * Changes: Add functional test - invoker kills application when applauncherd dies
+
+ -- Olli Leppanen <olli.leppanen@nokia.com>  Wed, 7 Sep 2011 15:12:13 +0300
+
+applauncherd (1.1.0) stable; urgency=low
+
+  * Changes: Add unit test for Logger - open log twice
+  * Fixes: NB#269075 - Precached (LibMeegotouch) applications do not set WM_CLASS window atom properly
+
+ -- Dmitry Rozenshtein <ext-dmitry.2.rozenshtein@nokia.com>  Mon, 5 Sep 2011 13:33:55 +0300
+
 applauncherd (1.0.9) stable; urgency=low
 
   * Changes: Improve test debug output.

src/launcherlib/booster.cpp

@@ -536,6 +536,10 @@ int Booster::launchProcess()
     if (!m_bootMode)
         preinit();
 
+    // make booster specific initializations unless booster is in boot mode
+    if (!m_bootMode)
+        preinit();
+
 #ifdef WITH_COVERAGE
     __gcov_flush();
 #endif

tests/harmattan/functests/tests.xml

@@ -19,6 +19,11 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_applications_exist</step>
       </case>
 
+      <case name="applauncherd__test_only_one_applauncherd_exist" type="Functional" description="test_only_one_applauncherd_exist " timeout="360" level="System" insignificant="false">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_only_one_applauncherd_exist</step>
+      </case>
+
+
 
       <case name="applauncherd__test_restart_booster" type="Functional" description="Test that booster is restarted if it is killed" timeout="360" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_restart_booster</step>

tests/harmattan/invoker-tests/tests.xml

@@ -27,6 +27,10 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-invoker.py test_invoker_usage_printing</step>
       </case>
 
+      <case name="applauncherd__test_invoker_help_printing" type="Functional" description="Test that applauncherd invoker ,help usage printing ok" timeout="360" level="System" insignificant="false">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-invoker.py test_invoker_help_printing</step>
+      </case>
+
       <case name="applauncherd__test_invoker_search_prog" type="Functional" description="Test that invoker finds binaries from PATH" timeout="360" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-invoker.py test_invoker_search_prog</step>
       </case>

tests/harmattan/testscripts/test-func-launcher.py

@@ -103,6 +103,18 @@ class launcher_tests (unittest.TestCase):
                 failed_apps.append(app)
         self.assert_(failed_apps == [], "Some applications do not have the launch files, list: %s" % str(failed_apps))
 
+    def test_only_one_applauncherd_exist(self):
+        """
+        test_only_one_applauncherd_can_start
+        """
+        stop_applauncherd()
+        st, op = commands.getstatusoutput("initctl start xsession/applauncherd")
+        time.sleep(2)
+        st_new, op = commands.getstatusoutput("initctl start xsession/applauncherd")
+ 
+        self.assert_(st == 0, "Applauncherd do not start")
+        self.assert_(st_new != 0, "Applauncherd even force start second time")
+
     def test_zombie_state_m(self):
         self._test_zombie_state(PREFERED_APP,'m')
 

tests/harmattan/testscripts/test-invoker.py

@@ -403,6 +403,14 @@ class InvokerTests(unittest.TestCase):
         p = run_cmd_as_user('invoker --help')
         self.assert_(p.wait() == 0, "'invoker --help' failed")
 
+    def test_invoker_help_printing(self):
+        """
+        Test that applauncherd invoker usage printing ok
+        """
+
+        p = run_cmd_as_user('invoker')
+        self.assert_(p.wait() == 1, "'invoker' failed")
+
     def test_app_link(self):
         """
         Test that symlink of an application can be launched.