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

Subscribers

People subscribed via source and target branches