Update templates

diff --git a/litmus/templates/artik10/conf.yaml b/litmus/templates/artik10/conf.yaml
deleted file mode 100644 (file)
index 5b81875..0000000
--- a/litmus/templates/artik10/conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-wayland-3parts-armv7l-artik/
-  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-boot-armv7l-artik10/
-username: <username>
-password: <password>

diff --git a/litmus/templates/artik10/conf_iot.yaml b/litmus/templates/artik10/conf_iot.yaml
new file mode 100644 (file)
index 0000000..5b81875
--- /dev/null
+++ b/litmus/templates/artik10/conf_iot.yaml
@@ -0,0 +1,5 @@
+binary_urls:
+  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-wayland-3parts-armv7l-artik/
+  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-boot-armv7l-artik10/
+username: <username>
+password: <password>

diff --git a/litmus/templates/artik10/misc/autoinput b/litmus/templates/artik10/misc/autoinput
deleted file mode 100755 (executable)
index 88d78e3..0000000
Binary files a/litmus/templates/artik10/misc/autoinput and /dev/null differ

diff --git a/litmus/templates/artik10/misc/getevent b/litmus/templates/artik10/misc/getevent
deleted file mode 100755 (executable)
index 66e2c2a..0000000
Binary files a/litmus/templates/artik10/misc/getevent and /dev/null differ

diff --git a/litmus/templates/artik10/tc.yaml b/litmus/templates/artik10/tc.yaml
deleted file mode 100644 (file)
index abaa181..0000000
--- a/litmus/templates/artik10/tc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/artik10/tc_iot.yaml b/litmus/templates/artik10/tc_iot.yaml
new file mode 100644 (file)
index 0000000..abaa181
--- /dev/null
+++ b/litmus/templates/artik10/tc_iot.yaml
@@ -0,0 +1,32 @@
+testcases:
+  - name: verify_process_is_running
+    from: litmus.helper.tests
+    result_dir: result
+    plan:
+      - name: dbus_is_running
+        param: dbus
+        pattern: .*/usr/bin/dbus-daemon.*
+      - name: enlightenment_is_running
+        param: enlightenment
+        pattern: .*/usr/bin/enlightenment.*
+      - name: sensord_is_running
+        param: sensord
+        pattern: .*/usr/bin/sensord.*
+      - name: deviced_is_running
+        param: deviced
+        pattern: .*/usr/bin/deviced.*
+      - name: pulseaudio_is_running
+        param: pulseaudio
+        pattern: .*/usr/bin/pulseaudio.*
+      - name: sdbd_is_running
+        param: sdbd
+        pattern: .*/usr/sbin/sdbd.*
+      - name: alarm-server_is_running
+        param: alarm-server
+        pattern: .*/usr/bin/alarm-server.*
+      - name: sound_server_is_running
+        param: sound_server
+        pattern: .*/usr/bin/sound_server.*
+      - name: media-server_is_running
+        param: media-server
+        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/artik10/userscript.py b/litmus/templates/artik10/userscript.py
index be6c41a367f11f36e662af87d3a89b7ac64612ca..a4636fb0801c4053202f5fe7e7cfbe606500c72c 100755 (executable)
--- a/litmus/templates/artik10/userscript.py
+++ b/litmus/templates/artik10/userscript.py
@@ -16,7 +16,7 @@ def main(*args, **kwargs):
     mgr.init_workingdir()
 
     # get projectinfo
-    project_info = load_yaml('conf.yaml')
+    project_info = load_yaml('conf_iot.yaml')
 
     username = project_info['username']
     password = project_info['password']
@@ -24,6 +24,9 @@ def main(*args, **kwargs):
     plugin_info = project_info['plugin_info']
 
     # get version from parameter
+    # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -38,6 +41,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [ARTIK10_001]
+    # dev_type = artik10
+    # uart_port = /dev/ttyUSB0
+
     dut = mgr.acquire_dut('artik10', max_retry_times=180)
 
     # flashing binaries to device.
@@ -56,7 +66,7 @@ def main(*args, **kwargs):
     if not os.path.exists('result'):
         os.mkdir('result')
 
-    testcases = load_yaml('tc.yaml')
+    testcases = load_yaml('tc_iot.yaml')
     add_test_helper(dut, testcases)
     dut.run_tests()
 

diff --git a/litmus/templates/artik5/conf.yaml b/litmus/templates/artik5/conf.yaml
deleted file mode 100644 (file)
index 7e90ffe..0000000
--- a/litmus/templates/artik5/conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-wayland-3parts-armv7l-artik/
-  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-boot-armv7l-artik5/
-username: <username>
-password: <password>

diff --git a/litmus/templates/artik5/conf_iot.yaml b/litmus/templates/artik5/conf_iot.yaml
new file mode 100644 (file)
index 0000000..7e90ffe
--- /dev/null
+++ b/litmus/templates/artik5/conf_iot.yaml
@@ -0,0 +1,5 @@
+binary_urls:
+  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-wayland-3parts-armv7l-artik/
+  - http://download.tizen.org/snapshots/tizen/common/latest/images/arm-wayland/common-boot-armv7l-artik5/
+username: <username>
+password: <password>

diff --git a/litmus/templates/artik5/misc/autoinput b/litmus/templates/artik5/misc/autoinput
deleted file mode 100755 (executable)
index 88d78e3..0000000
Binary files a/litmus/templates/artik5/misc/autoinput and /dev/null differ

diff --git a/litmus/templates/artik5/misc/getevent b/litmus/templates/artik5/misc/getevent
deleted file mode 100755 (executable)
index 66e2c2a..0000000
Binary files a/litmus/templates/artik5/misc/getevent and /dev/null differ

diff --git a/litmus/templates/artik5/tc.yaml b/litmus/templates/artik5/tc.yaml
deleted file mode 100644 (file)
index abaa181..0000000
--- a/litmus/templates/artik5/tc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/artik5/tc_iot.yaml b/litmus/templates/artik5/tc_iot.yaml
new file mode 100644 (file)
index 0000000..abaa181
--- /dev/null
+++ b/litmus/templates/artik5/tc_iot.yaml
@@ -0,0 +1,32 @@
+testcases:
+  - name: verify_process_is_running
+    from: litmus.helper.tests
+    result_dir: result
+    plan:
+      - name: dbus_is_running
+        param: dbus
+        pattern: .*/usr/bin/dbus-daemon.*
+      - name: enlightenment_is_running
+        param: enlightenment
+        pattern: .*/usr/bin/enlightenment.*
+      - name: sensord_is_running
+        param: sensord
+        pattern: .*/usr/bin/sensord.*
+      - name: deviced_is_running
+        param: deviced
+        pattern: .*/usr/bin/deviced.*
+      - name: pulseaudio_is_running
+        param: pulseaudio
+        pattern: .*/usr/bin/pulseaudio.*
+      - name: sdbd_is_running
+        param: sdbd
+        pattern: .*/usr/sbin/sdbd.*
+      - name: alarm-server_is_running
+        param: alarm-server
+        pattern: .*/usr/bin/alarm-server.*
+      - name: sound_server_is_running
+        param: sound_server
+        pattern: .*/usr/bin/sound_server.*
+      - name: media-server_is_running
+        param: media-server
+        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/artik5/userscript.py b/litmus/templates/artik5/userscript.py
index ccfb88e2db5e081b1645bd5be9b95d23835e7c6d..fb7f9c1ad0bd7d0886003ead4836d5c201fd6f30 100755 (executable)
--- a/litmus/templates/artik5/userscript.py
+++ b/litmus/templates/artik5/userscript.py
@@ -16,7 +16,7 @@ def main(*args, **kwargs):
     mgr.init_workingdir()
 
     # get projectinfo
-    project_info = load_yaml('conf.yaml')
+    project_info = load_yaml('conf_iot.yaml')
 
     username = project_info['username']
     password = project_info['password']
@@ -24,6 +24,9 @@ def main(*args, **kwargs):
     plugin_info = project_info['plugin_info']
 
     # get version from parameter
+    # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -38,6 +41,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [ARTIK5_001]
+    # dev_type = artik5
+    # uart_port = /dev/ttyUSB0
+
     dut = mgr.acquire_dut('artik5', max_retry_times=180)
 
     # flashing binaries to device.
@@ -56,7 +66,7 @@ def main(*args, **kwargs):
     if not os.path.exists('result'):
         os.mkdir('result')
 
-    testcases = load_yaml('tc.yaml')
+    testcases = load_yaml('tc_iot.yaml')
     add_test_helper(dut, testcases)
     dut.run_tests()
 

diff --git a/litmus/templates/standalone_tm1/conf_mobile.yaml b/litmus/templates/standalone_tm1/conf_mobile.yaml
index 072e0d79380add981d250e469c10de10ea982587..2530c5c39be44b1b692e6904132bde7e6b887c58 100644 (file)
--- a/litmus/templates/standalone_tm1/conf_mobile.yaml
+++ b/litmus/templates/standalone_tm1/conf_mobile.yaml
@@ -1,4 +1,4 @@
 binary_urls:
-    - http://download.tizen.org/snapshots/tizen/mobile/latest/images/target-TM1/mobile-wayland-armv7l-tm1/
+  - http://download.tizen.org/snapshots/tizen/mobile/latest/images/target-TM1/mobile-wayland-armv7l-tm1/
 username: <username>
 password: <password>

diff --git a/litmus/templates/standalone_tm1/conf_tv.yaml b/litmus/templates/standalone_tm1/conf_tv.yaml
deleted file mode 100644 (file)
index 43a1164..0000000
--- a/litmus/templates/standalone_tm1/conf_tv.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tm1/conf_wearable.yaml b/litmus/templates/standalone_tm1/conf_wearable.yaml
deleted file mode 100644 (file)
index eb9cbca..0000000
--- a/litmus/templates/standalone_tm1/conf_wearable.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tm1/tc_tv.yaml b/litmus/templates/standalone_tm1/tc_tv.yaml
deleted file mode 100644 (file)
index 44ed8a2..0000000
--- a/litmus/templates/standalone_tm1/tc_tv.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/standalone_tm1/tc_wearable.yaml b/litmus/templates/standalone_tm1/tc_wearable.yaml
deleted file mode 100644 (file)
index f1c099f..0000000
--- a/litmus/templates/standalone_tm1/tc_wearable.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_tm1/userscript.py b/litmus/templates/standalone_tm1/userscript.py
index 0ef6126732869126d8531aa8f4c8942f6d2a48e5..267e5dd89fa29abc5919da93b40533381c12b1c2 100755 (executable)
--- a/litmus/templates/standalone_tm1/userscript.py
+++ b/litmus/templates/standalone_tm1/userscript.py
@@ -23,6 +23,8 @@ def main(*args, **kwargs):
 
     # get version from parameter
     # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -37,6 +39,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [TM1_001]
+    # dev_type = standalone_tm1
+    # serialno = 01234TEST
+
     dut = mgr.acquire_dut('standalone_tm1', max_retry_times=180)
 
     # flashing binaries to device.

diff --git a/litmus/templates/standalone_tm2/conf_mobile.yaml b/litmus/templates/standalone_tm2/conf_mobile.yaml
index 1a6b53d060637b7c4457334c2c72a40813945fc3..62b7a520d500520b53171ef3a73ebc89b482f9b7 100644 (file)
--- a/litmus/templates/standalone_tm2/conf_mobile.yaml
+++ b/litmus/templates/standalone_tm2/conf_mobile.yaml
@@ -1,4 +1,4 @@
 binary_urls:
-    - http://download.tizen.org/snapshots/tizen/mobile/latest/images/arm64-wayland/mobile-wayland-arm64-tm2/
+  - http://download.tizen.org/snapshots/tizen/mobile/latest/images/arm64-wayland/mobile-wayland-arm64-tm2/
 username: <username>
 password: <password>

diff --git a/litmus/templates/standalone_tm2/conf_tv.yaml b/litmus/templates/standalone_tm2/conf_tv.yaml
deleted file mode 100644 (file)
index 43a1164..0000000
--- a/litmus/templates/standalone_tm2/conf_tv.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tm2/conf_wearable.yaml b/litmus/templates/standalone_tm2/conf_wearable.yaml
deleted file mode 100644 (file)
index eb9cbca..0000000
--- a/litmus/templates/standalone_tm2/conf_wearable.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tm2/tc_tv.yaml b/litmus/templates/standalone_tm2/tc_tv.yaml
deleted file mode 100644 (file)
index 44ed8a2..0000000
--- a/litmus/templates/standalone_tm2/tc_tv.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/standalone_tm2/tc_wearable.yaml b/litmus/templates/standalone_tm2/tc_wearable.yaml
deleted file mode 100644 (file)
index f1c099f..0000000
--- a/litmus/templates/standalone_tm2/tc_wearable.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_tm2/userscript.py b/litmus/templates/standalone_tm2/userscript.py
index 77a09c13939ab5c403c74c2edc0e9b0750b2e1ec..58b4bbbf8ef887f7b21d890465fcf5e3b687e427 100755 (executable)
--- a/litmus/templates/standalone_tm2/userscript.py
+++ b/litmus/templates/standalone_tm2/userscript.py
@@ -23,6 +23,8 @@ def main(*args, **kwargs):
 
     # get version from parameter
     # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -37,6 +39,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [TM2_001]
+    # dev_type = standalone_tm2
+    # serialno = 01234TEST
+
     dut = mgr.acquire_dut('standalone_tm2', max_retry_times=180)
 
     # flashing binaries to device.

diff --git a/litmus/templates/standalone_tw1/conf_mobile.yaml b/litmus/templates/standalone_tw1/conf_mobile.yaml
deleted file mode 100644 (file)
index 072e0d7..0000000
--- a/litmus/templates/standalone_tw1/conf_mobile.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/mobile/latest/images/target-TM1/mobile-wayland-armv7l-tm1/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tw1/conf_tv.yaml b/litmus/templates/standalone_tw1/conf_tv.yaml
deleted file mode 100644 (file)
index 43a1164..0000000
--- a/litmus/templates/standalone_tw1/conf_tv.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_tw1/conf_wearable.yaml b/litmus/templates/standalone_tw1/conf_wearable.yaml
index eb9cbcace04f19618f8e5c55aa1be6fa073dc3ed..4bc27e38194c5609cff7815f1c161bbbc060e8c8 100644 (file)
--- a/litmus/templates/standalone_tw1/conf_wearable.yaml
+++ b/litmus/templates/standalone_tw1/conf_wearable.yaml
@@ -1,4 +1,4 @@
 binary_urls:
-    - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
+  - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
 username: <username>
 password: <password>

diff --git a/litmus/templates/standalone_tw1/tc_mobile.yaml b/litmus/templates/standalone_tw1/tc_mobile.yaml
deleted file mode 100644 (file)
index 7932170..0000000
--- a/litmus/templates/standalone_tw1/tc_mobile.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: callmgrd_is_running
-        param: callmgrd
-        pattern: .*/usr/bin/callmgrd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_tw1/tc_tv.yaml b/litmus/templates/standalone_tw1/tc_tv.yaml
deleted file mode 100644 (file)
index 44ed8a2..0000000
--- a/litmus/templates/standalone_tw1/tc_tv.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/standalone_tw1/userscript.py b/litmus/templates/standalone_tw1/userscript.py
index e20d6dc1afc5280d938edc307a1906a8ace17e66..203720c1f3c1cea067b20dfef210c43ba26f653d 100755 (executable)
--- a/litmus/templates/standalone_tw1/userscript.py
+++ b/litmus/templates/standalone_tw1/userscript.py
@@ -23,6 +23,8 @@ def main(*args, **kwargs):
 
     # get version from parameter
     # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -37,6 +39,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [TW1_001]
+    # dev_type = standalone_tw1
+    # serialno = 01234TEST
+
     dut = mgr.acquire_dut('standalone_tw1', max_retry_times=180)
 
     # flashing binaries to device.

diff --git a/litmus/templates/standalone_u3/conf_mobile.yaml b/litmus/templates/standalone_u3/conf_mobile.yaml
deleted file mode 100644 (file)
index 072e0d7..0000000
--- a/litmus/templates/standalone_u3/conf_mobile.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/mobile/latest/images/target-TM1/mobile-wayland-armv7l-tm1/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_u3/conf_tv.yaml b/litmus/templates/standalone_u3/conf_tv.yaml
index 43a11640099b5072d1bf96b16ed6ad9d9cd1fe0e..ef4322caee8120183acc096cd5babde39a54b688 100644 (file)
--- a/litmus/templates/standalone_u3/conf_tv.yaml
+++ b/litmus/templates/standalone_u3/conf_tv.yaml
@@ -1,5 +1,5 @@
 binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
 username: <username>
 password: <password>

diff --git a/litmus/templates/standalone_u3/conf_wearable.yaml b/litmus/templates/standalone_u3/conf_wearable.yaml
deleted file mode 100644 (file)
index eb9cbca..0000000
--- a/litmus/templates/standalone_u3/conf_wearable.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_u3/tc_mobile.yaml b/litmus/templates/standalone_u3/tc_mobile.yaml
deleted file mode 100644 (file)
index 7932170..0000000
--- a/litmus/templates/standalone_u3/tc_mobile.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: callmgrd_is_running
-        param: callmgrd
-        pattern: .*/usr/bin/callmgrd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_u3/tc_wearable.yaml b/litmus/templates/standalone_u3/tc_wearable.yaml
deleted file mode 100644 (file)
index f1c099f..0000000
--- a/litmus/templates/standalone_u3/tc_wearable.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_u3/userscript.py b/litmus/templates/standalone_u3/userscript.py
index f577e4072daba0c0d3df60fe42786702027b5bd3..7d2e79829c5fc43f36b9d18f4950eb0cc4202af3 100755 (executable)
--- a/litmus/templates/standalone_u3/userscript.py
+++ b/litmus/templates/standalone_u3/userscript.py
@@ -23,6 +23,8 @@ def main(*args, **kwargs):
 
     # get version from parameter
     # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -37,6 +39,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [U3_001]
+    # dev_type = standalone_u3
+    # serialno = 01234TEST
+
     dut = mgr.acquire_dut('standalone_u3', max_retry_times=180)
 
     # flashing binaries to device.

diff --git a/litmus/templates/standalone_xu3/conf_mobile.yaml b/litmus/templates/standalone_xu3/conf_mobile.yaml
deleted file mode 100644 (file)
index 072e0d7..0000000
--- a/litmus/templates/standalone_xu3/conf_mobile.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/mobile/latest/images/target-TM1/mobile-wayland-armv7l-tm1/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_xu3/conf_tv.yaml b/litmus/templates/standalone_xu3/conf_tv.yaml
index 43a11640099b5072d1bf96b16ed6ad9d9cd1fe0e..ef4322caee8120183acc096cd5babde39a54b688 100644 (file)
--- a/litmus/templates/standalone_xu3/conf_tv.yaml
+++ b/litmus/templates/standalone_xu3/conf_tv.yaml
@@ -1,5 +1,5 @@
 binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
 username: <username>
 password: <password>

diff --git a/litmus/templates/standalone_xu3/conf_wearable.yaml b/litmus/templates/standalone_xu3/conf_wearable.yaml
deleted file mode 100644 (file)
index eb9cbca..0000000
--- a/litmus/templates/standalone_xu3/conf_wearable.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/wearable/latest/images/target-circle/wearable-wayland-armv7l-circle/
-username: <username>
-password: <password>

diff --git a/litmus/templates/standalone_xu3/tc_mobile.yaml b/litmus/templates/standalone_xu3/tc_mobile.yaml
deleted file mode 100644 (file)
index 7932170..0000000
--- a/litmus/templates/standalone_xu3/tc_mobile.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: callmgrd_is_running
-        param: callmgrd
-        pattern: .*/usr/bin/callmgrd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_xu3/tc_wearable.yaml b/litmus/templates/standalone_xu3/tc_wearable.yaml
deleted file mode 100644 (file)
index f1c099f..0000000
--- a/litmus/templates/standalone_xu3/tc_wearable.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: dbus_is_running
-        param: dbus
-        pattern: .*/usr/bin/dbus-daemon.*
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: sensord_is_running
-        param: sensord
-        pattern: .*/usr/bin/sensord.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: msg-server_is_running
-        param: msg-server
-        pattern: .*/usr/bin/msg-server.*
-      - name: connmand_is_running
-        param: connmand
-        pattern: .*/usr/sbin/connmand.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: sound_server_is_running
-        param: sound_server
-        pattern: .*/usr/bin/sound_server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*
-  - name: verify_dmesg
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: panel_is_alive
-        param: panel
-        pattern: .*panel is dead.*
-  - name: verify_wifi_is_working
-    from: litmus.helper.tests
-    wifi_apname: setup
-    wifi_password: 
-    result_dir: result

diff --git a/litmus/templates/standalone_xu3/userscript.py b/litmus/templates/standalone_xu3/userscript.py
index d19dc35e47fd8f7c8e91f70545664dddc8ab76cb..3fa85680742d21fac7043ac6366662fa5ce9e3a8 100755 (executable)
--- a/litmus/templates/standalone_xu3/userscript.py
+++ b/litmus/templates/standalone_xu3/userscript.py
@@ -23,6 +23,8 @@ def main(*args, **kwargs):
 
     # get version from parameter
     # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -37,6 +39,13 @@ def main(*args, **kwargs):
                                     version=version))
 
     # get an available device for testing.
+    # Please set up topology before acquiring device.
+    # Example)
+    # ~/.litmus/topology
+    # [XU3_001]
+    # dev_type = standalone_xu3
+    # serialno = 01234TEST
+
     dut = mgr.acquire_dut('standalone_xu3', max_retry_times=180)
 
     # flashing binaries to device.

diff --git a/litmus/templates/u3/conf.yaml b/litmus/templates/u3/conf.yaml
deleted file mode 100644 (file)
index 9a76742..0000000
--- a/litmus/templates/u3/conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidu3/
-username: <username>
-password: <password>

diff --git a/litmus/templates/u3/conf_tv.yaml b/litmus/templates/u3/conf_tv.yaml
new file mode 100644 (file)
index 0000000..284b50f
--- /dev/null
+++ b/litmus/templates/u3/conf_tv.yaml
@@ -0,0 +1,5 @@
+binary_urls:
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
+  - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidu3/
+username: <username>
+password: <password>

diff --git a/litmus/templates/u3/tc.yaml b/litmus/templates/u3/tc.yaml
deleted file mode 100644 (file)
index 44ed8a2..0000000
--- a/litmus/templates/u3/tc.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/u3/tc_tv.yaml b/litmus/templates/u3/tc_tv.yaml
new file mode 100644 (file)
index 0000000..44ed8a2
--- /dev/null
+++ b/litmus/templates/u3/tc_tv.yaml
@@ -0,0 +1,23 @@
+testcases:
+  - name: verify_process_is_running
+    from: litmus.helper.tests
+    result_dir: result
+    plan:
+      - name: enlightenment_is_running
+        param: enlightenment
+        pattern: .*/usr/bin/enlightenment.*
+      - name: deviced_is_running
+        param: deviced
+        pattern: .*/usr/bin/deviced.*
+      - name: pulseaudio_is_running
+        param: pulseaudio
+        pattern: .*/usr/bin/pulseaudio.*
+      - name: sdbd_is_running
+        param: sdbd
+        pattern: .*/usr/sbin/sdbd.*
+      - name: alarm-server_is_running
+        param: alarm-server
+        pattern: .*/usr/bin/alarm-server.*
+      - name: media-server_is_running
+        param: media-server
+        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/u3/userscript.py b/litmus/templates/u3/userscript.py
index a96580125beeb30a34e3a934c461e5beffec5888..f14f3e60204404d2dc4d341d63c15e8d29e94907 100755 (executable)
--- a/litmus/templates/u3/userscript.py
+++ b/litmus/templates/u3/userscript.py
@@ -15,13 +15,16 @@ def main(*args, **kwargs):
     mgr.init_workingdir()
 
     # get projectinfo
-    project_info = load_yaml('conf.yaml')
+    project_info = load_yaml('conf_tv.yaml')
 
     username = project_info['username']
     password = project_info['password']
     binary_urls = project_info['binary_urls']
 
     # get version from parameter
+    # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -48,7 +51,7 @@ def main(*args, **kwargs):
     if not os.path.exists('result'):
         os.mkdir('result')
 
-    testcases = load_yaml('tc.yaml')
+    testcases = load_yaml('tc_tv.yaml')
     add_test_helper(dut, testcases)
     dut.run_tests()
 

diff --git a/litmus/templates/xu3/conf.yaml b/litmus/templates/xu3/conf.yaml
deleted file mode 100644 (file)
index b218ccd..0000000
--- a/litmus/templates/xu3/conf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-binary_urls:
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
-    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
-username: <username>
-password: <password>

diff --git a/litmus/templates/xu3/conf_tv.yaml b/litmus/templates/xu3/conf_tv.yaml
new file mode 100644 (file)
index 0000000..b218ccd
--- /dev/null
+++ b/litmus/templates/xu3/conf_tv.yaml
@@ -0,0 +1,5 @@
+binary_urls:
+    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-wayland-armv7l-odroidu3/
+    - http://download.tizen.org/snapshots/tizen/tv/latest/images/arm-wayland/tv-boot-armv7l-odroidxu3/
+username: <username>
+password: <password>

diff --git a/litmus/templates/xu3/tc.yaml b/litmus/templates/xu3/tc.yaml
deleted file mode 100644 (file)
index 44ed8a2..0000000
--- a/litmus/templates/xu3/tc.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-testcases:
-  - name: verify_process_is_running
-    from: litmus.helper.tests
-    result_dir: result
-    plan:
-      - name: enlightenment_is_running
-        param: enlightenment
-        pattern: .*/usr/bin/enlightenment.*
-      - name: deviced_is_running
-        param: deviced
-        pattern: .*/usr/bin/deviced.*
-      - name: pulseaudio_is_running
-        param: pulseaudio
-        pattern: .*/usr/bin/pulseaudio.*
-      - name: sdbd_is_running
-        param: sdbd
-        pattern: .*/usr/sbin/sdbd.*
-      - name: alarm-server_is_running
-        param: alarm-server
-        pattern: .*/usr/bin/alarm-server.*
-      - name: media-server_is_running
-        param: media-server
-        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/xu3/tc_tv.yaml b/litmus/templates/xu3/tc_tv.yaml
new file mode 100644 (file)
index 0000000..44ed8a2
--- /dev/null
+++ b/litmus/templates/xu3/tc_tv.yaml
@@ -0,0 +1,23 @@
+testcases:
+  - name: verify_process_is_running
+    from: litmus.helper.tests
+    result_dir: result
+    plan:
+      - name: enlightenment_is_running
+        param: enlightenment
+        pattern: .*/usr/bin/enlightenment.*
+      - name: deviced_is_running
+        param: deviced
+        pattern: .*/usr/bin/deviced.*
+      - name: pulseaudio_is_running
+        param: pulseaudio
+        pattern: .*/usr/bin/pulseaudio.*
+      - name: sdbd_is_running
+        param: sdbd
+        pattern: .*/usr/sbin/sdbd.*
+      - name: alarm-server_is_running
+        param: alarm-server
+        pattern: .*/usr/bin/alarm-server.*
+      - name: media-server_is_running
+        param: media-server
+        pattern: .*/usr/bin/media-server.*

diff --git a/litmus/templates/xu3/userscript.py b/litmus/templates/xu3/userscript.py
index 372350553ec0e9df1d98d862761ba0e1367168a7..cd06c9d5f3d995aae2f1f629221c90386211d5c9 100755 (executable)
--- a/litmus/templates/xu3/userscript.py
+++ b/litmus/templates/xu3/userscript.py
@@ -15,13 +15,16 @@ def main(*args, **kwargs):
     mgr.init_workingdir()
 
     # get projectinfo
-    project_info = load_yaml('conf.yaml')
+    project_info = load_yaml('conf_tv.yaml')
 
     username = project_info['username']
     password = project_info['password']
     binary_urls = project_info['binary_urls']
 
     # get version from parameter
+    # ex) 20160923.3
+    # you can customize params from litmus (adhoc|run) -p option
+    # Nth arg : kwargs['param'][N]
     try:
         version = kwargs['param'][0]
     except (IndexError, TypeError):
@@ -48,7 +51,7 @@ def main(*args, **kwargs):
     if not os.path.exists('result'):
         os.mkdir('result')
 
-    testcases = load_yaml('tc.yaml')
+    testcases = load_yaml('tc_tv.yaml')
     add_test_helper(dut, testcases)
     dut.run_tests()