LAVA Android Test

Merge lp:~mwasilew/lava-android-test/monkey-long-for-juice into lp:lava-android-test

  1. monkey-long-for-juice
  2. Merge into trunk
Proposed by Milosz Wasilewski
Status: Merged
Merged at revision: 260
Proposed branch: lp:~mwasilew/lava-android-test/monkey-long-for-juice
Merge into: lp:lava-android-test
Diff against target: 28 lines (+3/-4)
2 files modified
lava_android_test/test_definitions/monkey_long_run.py (+2/-3)
lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh (+1/-1)
To merge this branch: bzr merge lp:~mwasilew/lava-android-test/monkey-long-for-juice
Reviewer Review Type Date Requested Status
Yongqin Liu Approve
Review via email: mp+181513@code.launchpad.net

Description of the change

The fix to:
- adjust the number of runs in the juice project
- enable FAILED_PATTERNS so the crashes are reported as failed tests
The fix was confirmed to work by Amit Pundir.

To post a comment you must log in.
Revision history for this message
Yongqin Liu (liuyq0307) wrote :

Thanks

review: Approve

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/monkey_long_run.py'
2--- lava_android_test/test_definitions/monkey_long_run.py 2013-05-16 09:05:03 +0000
3+++ lava_android_test/test_definitions/monkey_long_run.py 2013-08-22 10:17:08 +0000
4@@ -61,9 +61,8 @@
5 monkey_blacklist_android_path)]
6 #PATTERN = "^(?P<test_case_id>\w+):\W+(?P<measurement>\d+\.\d+)"
7 PATTERN = "## Network stats: elapsed time=(?P<measurement>\d+)ms"
8-FAILURE_PATTERNS = []
9-#FAILURE_PATTERNS = ['\*\* Monkey aborted due to error.',
10-# '\*\* System appears to have crashed']
11+FAILURE_PATTERNS = ['\*\* Monkey aborted due to error.',
12+ '\*\* System appears to have crashed']
13
14 inst = lava_android_test.testdef.AndroidTestInstaller(
15 steps_adb_pre=INSTALL_STEPS_ADB_PRE)
16
17=== modified file 'lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh'
18--- lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh 2013-04-03 10:11:45 +0000
19+++ lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh 2013-08-22 10:17:08 +0000
20@@ -1,7 +1,7 @@
21 #!/system/bin/sh
22 #monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 2147483647"
23 if [ $1 == 'juice' ]; then
24-monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 --pkg-blacklist-file $2 500"
25+monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 --pkg-blacklist-file $2 30000"
26 else
27 monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 --pkg-blacklist-file $3 25000"
28 fi

Subscribers

People subscribed via source and target branches