corrected packaging

Change-Id: I7d129c14b9fdab3501d9ffdf52b58e68d626e2c0
Signed-off-by: Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org>

diff --git a/LICENSE b/LICENSE
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/common/TODO b/common/TODO
new file mode 100644 (file)
index 0000000..f37ce24
--- /dev/null
+++ b/common/TODO
@@ -0,0 +1 @@
+Empty for the moment.

diff --git a/ivi/tts-bluez-tests/README b/ivi/tts-bluez-tests/README
old mode 100755 (executable)
new mode 100644 (file)
index e001d07..8f87d67
--- a/ivi/tts-bluez-tests/README
+++ b/ivi/tts-bluez-tests/README
@@ -30,8 +30,8 @@ Build case:
 1. rpm -ivh tts-bluez-tests-0.1.0-1.i386.rpm    --- install RPM to your testing machine 
 
 To run cases, you can either do step.2 or step.3
-2. cd /usr/share/tests/common-connectivity-suite/tts-bluez-tests and run any sh file by root account.
-3. testkit-lite -f /usr/share/tests/common-connectivity-suite/tts-bluez-tests/tests.xml --comm localhost -o ./results.xml
+2. cd /usr/share/tests/ivi-connectivity-tests/tts-bluez-tests and run any sh file by root account.
+3. testkit-lite -f /usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/tests.xml --comm localhost -o ./results.xml
 
 
 

diff --git a/ivi/tts-bluez-tests/data/client/README b/ivi/tts-bluez-tests/data/client/README
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/.README.swp b/ivi/tts-bluez-tests/data/server/.README.swp
deleted file mode 100755 (executable)
index 7337cf0..0000000
Binary files a/ivi/tts-bluez-tests/data/server/.README.swp and /dev/null differ

diff --git a/ivi/tts-bluez-tests/data/server/README b/ivi/tts-bluez-tests/data/server/README
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/gather_info.sh b/ivi/tts-bluez-tests/data/server/gather_info.sh
index 84783b6..d6a0d90 100755 (executable)
--- a/ivi/tts-bluez-tests/data/server/gather_info.sh
+++ b/ivi/tts-bluez-tests/data/server/gather_info.sh
@@ -1 +1,3 @@
+#!/bin/bash
+
 find . | xargs file | grep -v directory | awk '{print $1}' | sed 's/://g' | xargs md5sum | awk '{print $2" , "$1}'

diff --git a/ivi/tts-bluez-tests/data/server/server/root_file_1.bmp b/ivi/tts-bluez-tests/data/server/server/root_file_1.bmp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/root_file_2.bmp b/ivi/tts-bluez-tests/data/server/server/root_file_2.bmp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/root_file_3.txt b/ivi/tts-bluez-tests/data/server/server/root_file_3.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/server_info b/ivi/tts-bluez-tests/data/server/server/server_info
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir1/subdir1_test_file1.txt b/ivi/tts-bluez-tests/data/server/server/subdir1/subdir1_test_file1.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir1/subdir1_test_file2.txt b/ivi/tts-bluez-tests/data/server/server/subdir1/subdir1_test_file2.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir2/subdir2_test_file1.txt b/ivi/tts-bluez-tests/data/server/server/subdir2/subdir2_test_file1.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir2/subdir2_test_file2.txt b/ivi/tts-bluez-tests/data/server/server/subdir2/subdir2_test_file2.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file1.txt b/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file1.txt
old mode 100755 (executable)
new mode 100644 (file)
index e69de29..7878858
--- a/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file1.txt
+++ b/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file1.txt
@@ -0,0 +1,27 @@
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1
+subdir3_test_file1

diff --git a/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file2.txt b/ivi/tts-bluez-tests/data/server/server/subdir3/subdir3_test_file2.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/src/README b/ivi/tts-bluez-tests/src/README
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-bluez-tests/tests.xml b/ivi/tts-bluez-tests/tests.xml
old mode 100755 (executable)
new mode 100644 (file)
index 1072899..56e61dd
--- a/ivi/tts-bluez-tests/tests.xml
+++ b/ivi/tts-bluez-tests/tests.xml
@@ -12,7 +12,7 @@ check if system runs bluetoothd daemon in beginning of booting up.</step_desc>
             <expected>when system boots up, it should run bluetoothd daemon.</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_system_daemon_bluetoothd.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_system_daemon_bluetoothd.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -28,7 +28,7 @@ check if system runs bluetoothd daemon in beginning of booting up.</step_desc>
             <expected>it should get BT device name</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_get_name.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_get_name.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -45,7 +45,7 @@ Check if obexd rpm package is installed</step_desc>
             <expected>system should install obexd package</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_system_package_obexd.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_system_package_obexd.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -62,7 +62,7 @@ Check if obexd rpm package is installed</step_desc>
             <expected>1. Bluetooth MAC address should be output in pattern, for example, 00:22:69:FB:AA:8A</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_get_address.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_get_address.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -79,7 +79,7 @@ Check if obexd rpm package is installed</step_desc>
             <expected>1. The property value got from DBus call should be same with the value we set.</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_set_power.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_set_power.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -96,7 +96,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>System should install bluez package.</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_system_package_bluez.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_system_package_bluez.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -114,7 +114,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>1. For each execution during the 50 times, adapter power should be correctly On and Off.</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_set_stress_power_50times.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_set_stress_power_50times.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -130,7 +130,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>the hci0 discoverabletimeout could be set to 1</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_set_discoverabletimeout.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_set_discoverabletimeout.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -146,7 +146,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>hci0 pairable could be set to 0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_set_pairable_off.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_set_pairable_off.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -162,7 +162,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>hci0 pairable should be set to 0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_set_pairable_on.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_set_pairable_on.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -178,7 +178,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>it should present discoverabletimeout info.</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_get_discoverabletimeout.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_get_discoverabletimeout.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -194,7 +194,7 @@ Check if the bluez rpm package is installed</step_desc>
             <expected>it should get hci0 power status</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_adapter_get_power.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_adapter_get_power.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -209,11 +209,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_iscan.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_iscan.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_iscan.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_iscan.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -226,11 +226,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_name.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_name.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_name.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_name.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -243,11 +243,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_hci_name.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_hci_name.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_hci_name.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_hci_name.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -260,11 +260,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_piscan.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_piscan.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_set_piscan.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_set_piscan.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -277,11 +277,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_hci_dev.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_hci_dev.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_hci_dev.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_hci_dev.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -294,11 +294,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_get_name.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_get_name.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_get_name.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_get_name.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -311,11 +311,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_tool_scan.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_tool_scan.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/hci_tool_scan.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/hci_tool_scan.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -328,11 +328,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_gap_pairing_computer.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_gap_pairing_computer.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_gap_pairing_computer.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_gap_pairing_computer.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -345,11 +345,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_l2cap_ping_check.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_l2cap_ping_check.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_l2cap_ping_check.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_l2cap_ping_check.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r
@@ -362,11 +362,11 @@ Check if the bluez rpm package is installed</step_desc>
         <post_condition />\r
         <steps>\r
           <step order="1">\r
-            <step_desc>/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_gap_remove_pairing_computer.sh</step_desc>\r
+            <step_desc>/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_gap_remove_pairing_computer.sh</step_desc>\r
             <expected>0</expected>\r
           </step>\r
         </steps>\r
-        <test_script_entry test_script_expected_result="0">/usr/share/tests/common-connectivity-suite/tts-bluez-tests/bt_gap_remove_pairing_computer.sh</test_script_entry>\r
+        <test_script_entry test_script_expected_result="0">/usr/share/tests/ivi-connectivity-tests/tts-bluez-tests/bt_gap_remove_pairing_computer.sh</test_script_entry>\r
       </description>\r
       <categories>\r
         <category>IVI</category>\r

diff --git a/ivi/tts-connman-tests/ChangeLog b/ivi/tts-connman-tests/ChangeLog
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/README b/ivi/tts-connman-tests/README
old mode 100755 (executable)
new mode 100644 (file)
index 97f1810..56ef16a
--- a/ivi/tts-connman-tests/README
+++ b/ivi/tts-connman-tests/README
@@ -28,7 +28,7 @@ tts-connman-tests
     Flight: Test ConnMan in flight on/off mode.
     Property: Test property value in API
 Following are structure after installation:
-/usr/share/tests/common-connectivity-suite/tts-connman-tests/
+/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/
   CM_*.py: All automatic test cases
   common: Common functions that used in test cases
   README: This file 
@@ -64,10 +64,10 @@ Refer the section Test environment setup
 + Run
 Setup a open hidden WiFi AP with essid that you
 Connect to a ethernet network so that "ping -b" local network has response
-cd /usr/share/tests/common-connectivity-suite/tts-connman-tests/
+cd /usr/share/tests/ivi-connectivity-tests/tts-connman-tests/
 su - 
-export PYTHONPATH=$PYTHONPATH:/usr/share/tests/common-connectivity-suite/tts-connman-tests/common
-testkit-lite -f /usr/share/tests/common-connectivity-suite/tts-connman-tests/tests.xml --comm localhost -o ./results.xml
+export PYTHONPATH=$PYTHONPATH:/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/common
+testkit-lite -f /usr/share/tests/ivi-connectivity-tests/tts-connman-tests/tests.xml --comm localhost -o ./results.xml
 Please refer to the section Test Envrionment setup for what to test
 
 ---------------------

diff --git a/ivi/tts-connman-tests/coverage.ods b/ivi/tts-connman-tests/coverage.ods
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/data/apset.tgz b/ivi/tts-connman-tests/data/apset.tgz
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/network.jpg b/ivi/tts-connman-tests/network.jpg
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/Bearer/Bearer/bearer.cpp b/ivi/tts-connman-tests/src/Bearer/Bearer/bearer.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/MBT/fmbt-20m.conf b/ivi/tts-connman-tests/src/MBT/fmbt-20m.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/MBT/fmbt-basic.aal b/ivi/tts-connman-tests/src/MBT/fmbt-basic.aal
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/MBT/fmbt-basic.conf b/ivi/tts-connman-tests/src/MBT/fmbt-basic.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/MBT/teststeps.py b/ivi/tts-connman-tests/src/MBT/teststeps.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ivi/tts-connman-tests/src/common/bearer.sh b/ivi/tts-connman-tests/src/common/bearer.sh
index 05fe279..34088be 100755 (executable)
--- a/ivi/tts-connman-tests/src/common/bearer.sh
+++ b/ivi/tts-connman-tests/src/common/bearer.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -10,7 +11,6 @@
 #       Wang, Jing J  <jing.j.wang@intel.com>
 # Changlog:
 #
-#!/bin/sh
 
 if [ -z "$1" ]; then
         echo "Warning: Please specify execution command"

diff --git a/ivi/tts-connman-tests/tests.xml b/ivi/tts-connman-tests/tests.xml
old mode 100755 (executable)
new mode 100644 (file)
index 88ba23c..8923355
--- a/ivi/tts-connman-tests/tests.xml
+++ b/ivi/tts-connman-tests/tests.xml
@@ -13,7 +13,7 @@
             <expected>There should be one thread named connmand in background</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_Boot.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_Boot.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -40,7 +40,7 @@ TV             enabled
 handset      offline</expected>
           </step>
         </steps>
-      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_State_Ethernet.py</test_script_entry></description>
+      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_State_Ethernet.py</test_script_entry></description>
       <categories>
         <category>Netbook</category>
         <category>IVI</category>
@@ -60,7 +60,7 @@ reboot</pre_condition>
             <expected>OfflineMode is 'false'</expected>
           </step>
         </steps>
-      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_State_Offlinemode.py</test_script_entry></description>
+      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_State_Offlinemode.py</test_script_entry></description>
       <categories>
         <category>Netbook</category>
         <category>IVI</category>
@@ -83,7 +83,7 @@ reboot</pre_condition>
             <expected>Step 7 shows there is only one connmand running.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_OneConnmand.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_OneConnmand.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -103,7 +103,7 @@ reboot</pre_condition>
             <expected>There should be one thread named bluetoothd in background</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_BT.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_BT.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -129,7 +129,7 @@ TV             offline
 handset      offline</expected>
           </step>
         </steps>
-      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_State_Bluetooth.py</test_script_entry></description>
+      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_State_Bluetooth.py</test_script_entry></description>
       <categories>
         <category>Netbook</category>
         <category>IVI</category>
@@ -155,7 +155,7 @@ TV             enabled
 handset      offline</expected>
           </step>
         </steps>
-      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_State_WiFi.py</test_script_entry></description>
+      <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_State_WiFi.py</test_script_entry></description>
       <categories>
         <category>Netbook</category>
         <category>IVI</category>
@@ -174,7 +174,7 @@ handset      offline</expected>
             <expected>There should be one thread named wpa_supplicant in background</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Launch_WpaSupplicant.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Launch_WpaSupplicant.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -201,7 +201,7 @@ handset      offline</expected>
             <expected>Can ping PANU server</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_BT_IsReEnableWorks.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_BT_IsReEnableWorks.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -219,7 +219,7 @@ handset      offline</expected>
             <expected>The powered 'State' of bluetooth is 'true'</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_BT_IsPoweredOn.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_BT_IsPoweredOn.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -238,7 +238,7 @@ handset      offline</expected>
             <expected>The value is 'true'</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_BT_PoweredOn.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_BT_PoweredOn.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -257,7 +257,7 @@ handset      offline</expected>
             <expected>The value is  'false'</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_BT_PoweredOff.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_BT_PoweredOff.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -275,7 +275,7 @@ handset      offline</expected>
             <expected>There is bluetooth technology</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_BT_DeviceIsExist.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_BT_DeviceIsExist.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -295,7 +295,7 @@ handset      offline</expected>
             <expected>Can get IP and ping the AP</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WS_Open.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WS_Open.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -314,7 +314,7 @@ handset      offline</expected>
             <expected>Can get IP and ping the AP</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WS_WPA.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WS_WPA.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -335,7 +335,7 @@ handset      offline</expected>
             <expected>ConnMan should remember the password and can connect to the AP</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WA_RememberPasswd.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WA_RememberPasswd.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -355,7 +355,7 @@ handset      offline</expected>
             <expected>Error property is set.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WA_ForgotPassword.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WA_ForgotPassword.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -376,7 +376,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Nameservers.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Nameservers.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -396,7 +396,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PT_Type.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PT_Type.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -416,7 +416,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PT_Powered.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PT_Powered.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -436,7 +436,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Strength.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Strength.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -456,7 +456,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PM_SessionMode.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PM_SessionMode.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -476,7 +476,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Security.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Security.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -496,7 +496,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PM_OfflineMode.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PM_OfflineMode.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -516,7 +516,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PM_State.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PM_State.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -536,7 +536,7 @@ handset      offline</expected>
             <expected>As expected</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PT_Connected.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PT_Connected.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -556,7 +556,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_AutoConnect.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_AutoConnect.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -575,7 +575,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PT_Name.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PT_Name.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -594,7 +594,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_State.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_State.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -614,7 +614,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PT_Tethering.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PT_Tethering.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -634,7 +634,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Type.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Type.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -654,7 +654,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Domains.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Domains.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -674,7 +674,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Error.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Error.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -694,7 +694,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Name.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Name.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -714,7 +714,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Favorite.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Favorite.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -734,7 +734,7 @@ handset      offline</expected>
             <expected>:</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_PS_Immutable.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_PS_Immutable.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -758,7 +758,7 @@ handset      offline</expected>
             <expected>There is ethernet device</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_Eth_DeviceIsExist.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_Eth_DeviceIsExist.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -780,7 +780,7 @@ handset      offline</expected>
             <expected>Ping cannot receive any response.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_Disconnect.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_Disconnect.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -801,7 +801,7 @@ handset      offline</expected>
             <expected>Receives ping response.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_SmallBroadcastPing.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_SmallBroadcastPing.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -824,7 +824,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The value is  'false'</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_PoweredOff.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_PoweredOff.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -850,7 +850,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>ping response</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_IsReEnableWorks.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_IsReEnableWorks.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -870,7 +870,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The Powered status is on</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_IsPoweredOn.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_IsPoweredOn.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -891,7 +891,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The value is 'true'</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_PoweredOn.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_PoweredOn.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -912,7 +912,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>Ping will receive response.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_BigBroadcastPing.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_BigBroadcastPing.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -934,7 +934,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>There is WiFi device</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_WG_DeviceIsExist.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_WG_DeviceIsExist.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -957,7 +957,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The state should be 'online' for this connected WIFI AP.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_State_WIFI_AvialableAP.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_State_WIFI_AvialableAP.py</test_script_entry>
       </description>
       <categories>
         <category>Netbook</category>
@@ -981,7 +981,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SS_IPv4.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SS_IPv4.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1004,7 +1004,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SS_Favorite.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SS_Favorite.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1027,7 +1027,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SC_IPv4.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SC_IPv4.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1050,7 +1050,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SC_Favorite.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SC_Favorite.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1073,7 +1073,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SS_AutoConnect.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SS_AutoConnect.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1096,7 +1096,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SC_State.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SC_State.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1119,7 +1119,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SC_Connected.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SC_Connected.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1142,7 +1142,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SC_OfflineMode.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SC_OfflineMode.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>
@@ -1165,7 +1165,7 @@ Pass/Fail Criteria:   The value is  'false'</step_desc>
             <expected>The callback function is called.</expected>
           </step>
         </steps>
-        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/common-connectivity-suite/tts-connman-tests/CM_SM_State.py</test_script_entry>
+        <test_script_entry test_script_expected_result='0' timeout='360'>/usr/share/tests/ivi-connectivity-tests/tts-connman-tests/CM_SM_State.py</test_script_entry>
       </description>
       <categories>
         <category>Mobile</category>

diff --git a/packaging/common-connectivity-suite.manifest b/packaging/common-connectivity-suite.manifest
new file mode 100644 (file)
index 0000000..0bd71d8
--- /dev/null
+++ b/packaging/common-connectivity-suite.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+        <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/common-connectivity-suite.spec b/packaging/common-connectivity-suite.spec
old mode 100755 (executable)
new mode 100644 (file)
index fc6246a..7d7576d
--- a/packaging/common-connectivity-suite.spec
+++ b/packaging/common-connectivity-suite.spec
@@ -1,95 +1,86 @@
-%define _unpackaged_files_terminate_build 0
-
-Name: common-connectivity-suite
-Summary: common-connectivity-suite
-Version: 0.1.0
-Release: 1
-License: GPLv2
-Group: Development/Testing
-Source0: %{name}-%{version}.tar.gz
-
+Name:          common-connectivity-suite
+Summary:       Connectivity suite for Tizen Common
+Version:       1.0.0
+Release:       1
+License:       GPL-2.0
+Group:         Development/Testing
+Source0:       %{name}-%{version}.tar.gz
+Source1001:     %{name}.manifest
+BuildRequires: fdupes
+Requires:      bluez
+Requires:      bluez-test
+Requires:      common-suite-launcher
+Requires:      connman
+Requires:      connman-test
+Requires:      testkit-lite
+BuildArch:     noarch
 
 %description
-This package is IVI common connectivity test suite
-
-%package -n tts-bluez-tests
-Summary: Bluez test suit   
-Group:   Development/Testing
+The common-connectivity-suite validates the connectivity features of the Tizen Common image : core connman, wifi, bluetooth
 
-%description -n tts-bluez-tests
-%{summary}.
 
+%package -n ivi-connectivity-tests
+Summary:       Bluez test suite   
+Group:         Development/Testing
+Requires:      bluez
+Requires:      connman
+Requires:      connman-test
+Requires:      testkit-lite
 
-%package -n tts-connman-tests
-Summary: Connman test suit   
-Group:   Development/Testing
+%description -n ivi-connectivity-tests
+IVI multimedia test suite. Validates connectivity features 
 
-%description -n tts-connman-tests
-%{summary}.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 
-%install
-
-install -d %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests
-install -d %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests/data
-install -d %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests/data/server
-
-install -m 0755 ivi/tts-bluez-tests/src/* %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests
-install -m 0755 ivi/tts-bluez-tests/tests.xml %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests
-install -m 0755 ivi/tts-bluez-tests/README %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests
-install -m 0755 ivi/tts-bluez-tests/data/client/* %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests/data
-cp -fr ivi/tts-bluez-tests/data/server/* %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests/data/server
-install LICENSE %{buildroot}/%{_datadir}/tests/%{name}/tts-bluez-tests
-
-
-install -d %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-
-install -m 0755 ivi/tts-connman-tests/src/3G/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/BM/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/BT/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/common/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Ethernet/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Flight/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Launch/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/MBT/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Profile/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Property/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Signal/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/State/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/Stress/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-install -m 0755 ivi/tts-connman-tests/src/WiFi/* %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/
-
-install -d %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/data
-install -m 0755 ivi/tts-connman-tests/data/apset.tgz %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests/data
 
-install -m 0755 ivi/tts-connman-tests/network.jpg %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-
-install -m 0755 ivi/tts-connman-tests/bisect.sh %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-install -m 0755 ivi/tts-connman-tests/tests.xml %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-install -m 0755 ivi/tts-connman-tests/README %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-install LICENSE %{buildroot}/%{_datadir}/tests/%{name}/tts-connman-tests
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files -n tts-bluez-tests
-%defattr(-,root,root)
-%{_datadir}/tests/%{name}/tts-bluez-tests
-%license LICENSE
-
-%files -n tts-connman-tests
+%install
+# common-connectivity-suite package
+install -d %{buildroot}/%{_datadir}/tests/%{name}
+install -m 0644 common/TODO %{buildroot}/%{_datadir}/tests/%{name}
+
+# ivi-connectivity-tests package
+install -d %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-bluez-tests
+install -d %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0644 LICENSE %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests
+
+install -m 0644 ivi/tts-bluez-tests/tests.xml %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-bluez-tests
+install -m 0755 ivi/tts-bluez-tests/src/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-bluez-tests
+cp -r ivi/tts-bluez-tests/data %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-bluez-tests
+
+install -m 0755 ivi/tts-connman-tests/bisect.sh %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0644 ivi/tts-connman-tests/network.jpg %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0644 ivi/tts-connman-tests/tests.xml %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0644 ivi/tts-connman-tests/README %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/3G/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/BM/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/BT/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/common/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Ethernet/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Flight/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Launch/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/MBT/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Profile/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Property/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Signal/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/State/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/Stress/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+install -m 0755 ivi/tts-connman-tests/src/WiFi/* %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+cp -r ivi/tts-connman-tests/data %{buildroot}/%{_datadir}/tests/ivi-connectivity-tests/tts-connman-tests
+
+%fdupes %{buildroot}
+
+
+%files
+%manifest %{name}.manifest
 %defattr(-,root,root)
-%{_datadir}/tests/%{name}/tts-connman-tests
-%license LICENSE
+%{_datadir}/tests/%{name}
 
-%changelog
-* Fri May 23 2014 Wu dawei<daweix.wu@intel.com> 0.1.0-1
- - Initial common connectivity suite test
 
+%files -n ivi-connectivity-tests
+%defattr(-,root,root)
+%{_datadir}/tests/ivi-connectivity-tests