Merge lp:~naresh-kamboju/lava-android-test/adding-task_placement into lp:lava-android-test

Proposed by Naresh Kamboju
Status: Merged
Merged at revision: 211
Proposed branch: lp:~naresh-kamboju/lava-android-test/adding-task_placement
Merge into: lp:lava-android-test
Diff against target: 74 lines (+57/-0) (has conflicts)
2 files modified
doc/tests.rst (+8/-0)
lava_android_test/test_definitions/task_placement.py (+49/-0)
Text conflict in doc/tests.rst
To merge this branch: bzr merge lp:~naresh-kamboju/lava-android-test/adding-task_placement
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+126556@code.launchpad.net

Description of the change

Adding new test entry task_placement in lava-android-test

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

i'll merge this now also

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/tests.rst'
2--- doc/tests.rst 2012-09-26 21:03:03 +0000
3+++ doc/tests.rst 2012-09-26 21:29:21 +0000
4@@ -101,8 +101,16 @@
5
6 shells
7 ++++++
8+<<<<<<< TREE
9 .. automodule:: lava_android_test.test_definitions.shells
10
11 sched_tests
12 ++++++++++
13 .. automodule:: lava_android_test.test_definitions.sched_tests
14+=======
15+.. automodule:: lava_android_test.test_definitions.shells
16+
17+task_placement
18+++++++++++++++
19+.. automodule:: lava_android_test.test_definitions.task_placement
20+>>>>>>> MERGE-SOURCE
21
22=== added file 'lava_android_test/test_definitions/task_placement.py'
23--- lava_android_test/test_definitions/task_placement.py 1970-01-01 00:00:00 +0000
24+++ lava_android_test/test_definitions/task_placement.py 2012-09-26 21:29:21 +0000
25@@ -0,0 +1,49 @@
26+# Copyright (c) 2012 Linaro
27+
28+# Author: Linaro Validation Team <linaro-dev@lists.linaro.org>
29+#
30+# This file is part of LAVA Android Test.
31+#
32+#
33+# This program is free software: you can redistribute it and/or modify
34+# it under the terms of the GNU General Public License as published by
35+# the Free Software Foundation, either version 3 of the License, or
36+# (at your option) any later version.
37+#
38+# This program is distributed in the hope that it will be useful,
39+# but WITHOUT ANY WARRANTY; without even the implied warranty of
40+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41+# GNU General Public License for more details.
42+#
43+# You should have received a copy of the GNU General Public License
44+# along with this program. If not, see <http://www.gnu.org/licenses/>.
45+
46+"""
47+Drives task placement scripts that are pre-intalled on Linaro Android
48+builds of big.LITTLE
49+
50+**URL:** https://linaro-private.git.linaro.org/gitweb?p=bL_tests/task-placement-tests.git
51+
52+**Default options:** None
53+"""
54+
55+import lava_android_test.testdef
56+
57+test_name = 'task_placement'
58+
59+DEFAULT_OPTIONS=''
60+
61+INSTALL_STEPS_ADB_PRE = []
62+ADB_SHELL_STEPS = ['run_all_task_placement_tests.sh $(OPTIONS)']
63+PATTERN = "(?P<test_case_id>.*-*)\s+:\s+(?P<result>(PASS|FAIL))"
64+
65+inst = lava_android_test.testdef.AndroidTestInstaller(
66+ steps_adb_pre=INSTALL_STEPS_ADB_PRE)
67+run = lava_android_test.testdef.AndroidTestRunner(
68+ adbshell_steps=ADB_SHELL_STEPS)
69+parser = lava_android_test.testdef.AndroidTestParser(PATTERN)
70+testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
71+ installer=inst,
72+ runner=run,
73+ parser=parser,
74+ default_options=DEFAULT_OPTIONS)

Subscribers

People subscribed via source and target branches