Merge lp:~chengjie-he/lava-android-test/monkey_long_run into lp:lava-android-test

[Chengjie HE]

to make monkey can run for a long time

[lp:~chengjie-he/lava-android-test/monkey_long_run]

154. By Chengjie HE on 2012-06-19

add a new test of monkey_long_run

[Yongqin Liu (liuyq0307)]

except the event count in shell script, others seem ok for me.
Will change the event count to 25000 when merge

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-06-19 02:39:56 +0000
+++ MANIFEST.in	2012-06-19 03:01:18 +0000
@@ -2,6 +2,7 @@
 include README
 include .testr.conf
 include lava_android_test/test_definitions/monkey/*
+include lava_android_test/test_definitions/monkey_long_run/*
 include lava_android_test/test_definitions/android-0xbenchmark/*
 include lava_android_test/test_definitions/busybox/*
 include lava_android_test/test_definitions/cts/*

=== added directory 'lava_android_test/test_definitions/monkey_long_run'
=== added file 'lava_android_test/test_definitions/monkey_long_run.py'
--- lava_android_test/test_definitions/monkey_long_run.py	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/monkey_long_run.py	2012-06-19 03:01:18 +0000
@@ -0,0 +1,56 @@
+# Copyright (c) 2011 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 os
+import lava_android_test.testdef
+from lava_android_test.config import get_config
+
+test_name = 'monkey_long_run'
+config = get_config()
+curdir = os.path.realpath(os.path.dirname(__file__))
+monkey_sh_name = 'monkey_long_run.sh'
+monkey_sh_path = os.path.join(curdir, test_name, monkey_sh_name)
+monkey_sh_android_path = os.path.join(config.installdir_android,
+                                      test_name, monkey_sh_name)
+monkey_blacklist_name = 'package_black_list'
+monkey_blacklist_path = os.path.join(curdir, test_name, monkey_blacklist_name)
+monkey_blacklist_android_path = os.path.join(config.installdir_android,
+                                      test_name, monkey_blacklist_name)
+
+INSTALL_STEPS_ADB_PRE = ['push %s %s ' % (monkey_sh_path,
+                                          monkey_sh_android_path),
+                          'push %s %s ' % (monkey_blacklist_path,
+                                          monkey_blacklist_android_path),
+                          'shell chmod 777 %s' % monkey_sh_android_path]
+
+ADB_SHELL_STEPS =  ['%s %s' % (monkey_sh_android_path, monkey_blacklist_android_path)]
+#PATTERN = "^(?P<test_case_id>\w+):\W+(?P<measurement>\d+\.\d+)"
+PATTERN = "## Network stats: elapsed time=(?P<measurement>\d+)ms"
+FAILURE_PATTERNS = []
+#FAILURE_PATTERNS = ['\*\* Monkey aborted due to error.',
+#                    '\*\* System appears to have crashed']
+
+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,
+               appendall={'units': 'ms'}, failure_patterns=FAILURE_PATTERNS)
+testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
+                        installer=inst, runner=run, parser=parser)

=== added file 'lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh'
--- lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/monkey_long_run/monkey_long_run.sh	2012-06-19 03:01:18 +0000
@@ -0,0 +1,12 @@
+#!/system/bin/sh
+#monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 2147483647"
+if [ -e $1 ]; then
+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 $1 10000"
+else
+monkey_cmd="monkey -s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20 --throttle 500 500"
+echo "you did not have a blacklist file! so run the common way"
+fi
+
+echo execute command=${monkey_cmd}
+${monkey_cmd}
+echo MONKEY_RET_CODE=$?

=== added file 'lava_android_test/test_definitions/monkey_long_run/package_black_list'
--- lava_android_test/test_definitions/monkey_long_run/package_black_list	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/monkey_long_run/package_black_list	2012-06-19 03:01:18 +0000
@@ -0,0 +1,2 @@
+com.android.camera
+com.android.connectivitymanagertest