Merge lp:~liuyq0307/lava-android-test/modification-sleep-helloworld into lp:~asac/lava-android-test/helloworld-simple

[Yongqin Liu]

did some small modification
and add the sleep script here

[lp:~liuyq0307/lava-android-test/modification-sleep-helloworld]

168. By Yongqin Liu on 2012-06-14

modify the pattern error

[Alexander Sack (asac)]

looks good.

[Alexander Sack (asac)]

would be good to have any type of default ... like one minute.

[Andy Doan (doanac)]

i've got an updated branch with this that also includes the ability to have a default option. I'll do the merge.

review: Approve

Unmerged revisions

168. By Yongqin Liu on 2012-06-14

modify the pattern error

167. By Yongqin Liu on 2012-06-14

add some small modification

=== modified file 'lava_android_test/test_definitions/helloworld.py'
--- lava_android_test/test_definitions/helloworld.py	2012-06-14 12:45:44 +0000
+++ lava_android_test/test_definitions/helloworld.py	2012-06-14 15:28:17 +0000
@@ -21,11 +21,11 @@
 import lava_android_test.config
 import lava_android_test.testdef
 
-test_name = 'hello_world'
+test_name = 'helloworld'
 
 INSTALL_STEPS_ADB_PRE = []
-ADB_SHELL_STEPS = ['echo hello_world: PASS']
-PATTERN = "^\s*(?P<test_case_id>[^:]*?):\s+(?P<result>(PASS|FAIL)?)\s+-\s+"
+ADB_SHELL_STEPS = ['echo helloworld: PASS']
+PATTERN = "^\s*(?P<test_case_id>[^:]+?):\s+(?P<result>(PASS|FAIL)?)\s*$"
 
 inst = lava_android_test.testdef.AndroidTestInstaller(
                                 steps_adb_pre=INSTALL_STEPS_ADB_PRE)

=== added file 'lava_android_test/test_definitions/sleep.py'
--- lava_android_test/test_definitions/sleep.py	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/sleep.py	2012-06-14 15:28:17 +0000
@@ -0,0 +1,38 @@
+# Copyright (c) 2012 Linaro
+
+# Author: Linaro Validation Team <[e-mail]>
+#
+# This file is part of LAVA Android Test.
+#
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import lava_android_test.config
+import lava_android_test.testdef
+
+test_name = 'sleep'
+
+INSTALL_STEPS_ADB_PRE = []
+ADB_SHELL_STEPS = ['sleep $(OPTIONS); echo sleep_$(OPTIONS): PASS']
+PATTERN = "^\s*(?P<test_case_id>[^:]+?):\s+(?P<result>(PASS|FAIL)?)\s*$"
+
+inst = lava_android_test.testdef.AndroidTestInstaller(
+                                steps_adb_pre=INSTALL_STEPS_ADB_PRE)
+run = lava_android_test.testdef.AndroidTestRunner(
+                                    adbshell_steps=ADB_SHELL_STEPS)
+parser = lava_android_test.testdef.AndroidTestParser(PATTERN)
+testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
+                                    installer=inst,
+                                    runner=run,
+                                    parser=parser)