From 2a0a3e722a87adef9dbe3cb2aa139df43116e467 Mon Sep 17 00:00:00 2001
From: Nimika Keshri <nimika.1.keshri@nokia.com>
Date: Tue, 10 Aug 2010 13:42:39 +0300
Subject: [PATCH] Changes: test for search-app removed. Some minor
 modifications as well RevBy: TrustMe

---
 tests/TestScripts/test-func-launcher.py | 11 ++---------
 tests/bug-tests/tests.xml               |  8 ++++----
 tests/functests/tests.xml               |  4 ----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/tests/TestScripts/test-func-launcher.py b/tests/TestScripts/test-func-launcher.py
index 317bbc4..e6bd2d6 100644
--- a/tests/TestScripts/test-func-launcher.py
+++ b/tests/TestScripts/test-func-launcher.py
@@ -577,21 +577,14 @@ class launcher_tests (unittest.TestCase):
         str = op.split('\n')
         self.assert_(str[0] == 'Usage: applauncherd [options]', "usage not printed properly")
 
-    def test_014_search_path(self):
-        """
-        Test invoker search application path
-        """
-        st = os.system("invoker --type=m fala_ft_hello.launch")
-        self.assert_(st == 0, "Application not found ")
-
-    def test_015_fd_booster_m(self):
+    def test_014_fd_booster_m(self):
         """
         File descriptor test for booster-m
         """
         count = self.get_file_descriptor("booster-m","m")
         self.assert_(count != 0, "None of the file descriptors were changed")
 
-    def test_016_fd_booster_q(self):
+    def test_015_fd_booster_q(self):
         """
         File descriptor test for booster-q
         """
diff --git a/tests/bug-tests/tests.xml b/tests/bug-tests/tests.xml
index d833dc3..e7260a8 100644
--- a/tests/bug-tests/tests.xml
+++ b/tests/bug-tests/tests.xml
@@ -76,12 +76,12 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="fd-booster-m" type="Functional" description="File descriptor test for booster-m" timeout="120" level="System" insignificant="true">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_015_fd_booster_m</step>
+      <case name="fd-booster-m" type="Functional" description="File descriptor test for booster-m" timeout="120" 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_014_fd_booster_m</step>
       </case>
 
-      <case name="fd-booster-m" type="Functional" description="File descriptor test for booster-q" timeout="120" level="System" insignificant="true">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_016_fd_booster_q</step>
+      <case name="fd-booster-q" type="Functional" description="File descriptor test for booster-q" timeout="120" 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_015_fd_booster_q</step>
       </case>
 
       <environments>
diff --git a/tests/functests/tests.xml b/tests/functests/tests.xml
index 5a0cd49..0545191 100644
--- a/tests/functests/tests.xml
+++ b/tests/functests/tests.xml
@@ -43,10 +43,6 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_013_applauncherd_usage</step>
       </case>
 
-      <case name="search-app" type="Functional" description="Test that invokers --delay parameter works" timeout="360" level="System" insignificant="true">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_014_search_path</step>
-      </case>
-
       <environments>
           <scratchbox>true</scratchbox>
           <hardware>true</hardware>