Merge lp:~liuyq0307/lava-android-test/exclude-devtool into lp:lava-android-test

Proposed by Yongqin Liu on 2012-02-15
Status: Needs review
Proposed branch: lp:~liuyq0307/lava-android-test/exclude-devtool
Merge into: lp:lava-android-test
Diff against target: 56 lines (+11/-5)
4 files modified
lava_android_test/test_definitions/cts/cts_wrapper.sh (+1/-1)
lava_android_test/test_definitions/monkey.py (+6/-2)
lava_android_test/test_definitions/monkey/blacklist (+2/-0)
lava_android_test/test_definitions/monkey/monkey.sh (+2/-2)
To merge this branch: bzr merge lp:~liuyq0307/lava-android-test/exclude-devtool
Reviewer Review Type Date Requested Status
Linaro Android Team 2012-02-15 Pending
Linaro Validation Team 2012-02-15 Pending
Review via email: mp+93121@code.launchpad.net

Description of the change

disable the test of Dev Tools Application on monkey test

To post a comment you must log in.
Paul Larson (pwlars) wrote :

I'd like to check with the android guys on this. We've discussed this before, that monkey should disable the bad behavior stuff. Anything else that should be blacklisted? Are you good with this?

Botao (botao-sun) wrote :

Would you increase the interval time between 2 actions to a bigger number? For example: --throttle 2000. 500 is a typical number, but on some of our builds without hardware acceleration, it seems be too short.

Or, we can assign different numbers to different builds.

FYI.

Yongqin Liu (liuyq0307) wrote :

> I'd like to check with the android guys on this. We've discussed this before,
> that monkey should disable the bad behavior stuff. Anything else that should
> be blacklisted?
another possible one is the setting application,
but I am not sure if it's needed.

the settings test may cause the adb disconnected,
like change the eth0 settings, or disable the usb debug mode.

from this point it should be needed.

135. By Yongqin Liu on 2012-02-15

add settings to blacklist of monkey and change the --throttle to 1000

136. By Yongqin Liu on 2012-02-15

merge with trunk

Unmerged revisions

136. By Yongqin Liu on 2012-02-15

merge with trunk

135. By Yongqin Liu on 2012-02-15

add settings to blacklist of monkey and change the --throttle to 1000

134. By Yongqin Liu on 2012-02-13

add exclusion of Dev Tools application for monkey test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_android_test/test_definitions/cts/cts_wrapper.sh'
2--- lava_android_test/test_definitions/cts/cts_wrapper.sh 2012-02-10 18:16:42 +0000
3+++ lava_android_test/test_definitions/cts/cts_wrapper.sh 2012-02-15 08:14:19 +0000
4@@ -71,7 +71,7 @@
5 ./android-cts/tools/cts-tradefed run cts ${test_str}|tee cts_output.log
6 RET_CODE=$?
7 fi
8-rm -f tee cts_output.log
9+rm -f cts_output.log
10 if [ ${RET_CODE} -ne 0 ]; then
11 echo "Faild to run cts for test (${test_str})"
12 ### comment it so that we can get the test result that has been executed
13
14=== modified file 'lava_android_test/test_definitions/monkey.py'
15--- lava_android_test/test_definitions/monkey.py 2011-11-08 09:48:05 +0000
16+++ lava_android_test/test_definitions/monkey.py 2012-02-15 08:14:19 +0000
17@@ -25,13 +25,17 @@
18 config = get_config()
19 curdir = os.path.realpath(os.path.dirname(__file__))
20 monkey_sh_name = 'monkey.sh'
21-monkey_sh_path = os.path.join(curdir, 'monkey', monkey_sh_name)
22+monkey_sh_path = os.path.join(curdir, test_name, monkey_sh_name)
23 monkey_sh_android_path = os.path.join(config.installdir_android, test_name, monkey_sh_name)
24+black_name = 'blacklist'
25+blacklist_path = os.path.join(curdir, test_name, black_name)
26+blacklist_android_path = os.path.join(config.installdir_android, test_name, black_name)
27
28 INSTALL_STEPS_ADB_PRE = ['push %s %s ' % (monkey_sh_path, monkey_sh_android_path),
29+ 'push %s %s ' % (blacklist_path, blacklist_android_path),
30 'shell chmod 777 %s' % monkey_sh_android_path]
31
32-ADB_SHELL_STEPS = [monkey_sh_android_path]
33+ADB_SHELL_STEPS = ['%s %s' % (monkey_sh_android_path, blacklist_android_path)]
34 #PATTERN = "^(?P<test_case_id>\w+):\W+(?P<measurement>\d+\.\d+)"
35 PATTERN = "## Network stats: elapsed time=(?P<measurement>\d+)ms"
36 FAILURE_PATTERNS = []
37
38=== added file 'lava_android_test/test_definitions/monkey/blacklist'
39--- lava_android_test/test_definitions/monkey/blacklist 1970-01-01 00:00:00 +0000
40+++ lava_android_test/test_definitions/monkey/blacklist 2012-02-15 08:14:19 +0000
41@@ -0,0 +1,2 @@
42+com.android.development
43+com.android.settings
44
45=== modified file 'lava_android_test/test_definitions/monkey/monkey.sh'
46--- lava_android_test/test_definitions/monkey/monkey.sh 2011-10-10 11:42:55 +0000
47+++ lava_android_test/test_definitions/monkey/monkey.sh 2012-02-15 08:14:19 +0000
48@@ -1,6 +1,6 @@
49 #!/system/bin/sh
50-#monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 2147483647"
51-monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 500"
52+blacklist="${1}"
53+monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --pkg-blacklist-file ${blacklist} -v --throttle 1000 2147483647"
54 echo execute command=${monkey_cmd}
55 ${monkey_cmd}
56 echo MONKEY_RET_CODE=$?

Subscribers

People subscribed via source and target branches