Add files via upload

add industrial tools shell for test deployment
update themis.py

scripts/run_fastbot.sh

@@ -8,7 +8,7 @@ TEST_TIME=$5 # e.g., 10s, 10m, 10h
 HEADLESS=$6 # e.g., -no-window
 LOGIN_SCRIPT=$7 # the script for app login via uiautomator2
 
-FASTBOT-TOOL=../tools/fastbot-bin
+FASTBOT_TOOL=../tools/
 
 # wait for the target device
 function wait_for_device(){
@@ -72,20 +72,22 @@ then
     echo "** APP LOGIN (${AVD_SERIAL})"
 
     # enable if use the login script
-    # adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
+    sleep 5 # wait for a few seconds before installation to avoid such error: "adb: connect error for write: closed"
-    # echo "** INSTALL APP (${AVD_SERIAL})"
+    adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
-    # python3 $LOGIN_SCRIPT ${AVD_SERIAL} 2>&1 | tee $result_dir/login.log
+    echo "** INSTALL APP (${AVD_SERIAL})"
+    python3 $LOGIN_SCRIPT ${AVD_SERIAL} 2>&1 | tee $result_dir/login.log
 
     # enable if use the snapshot (already login, do not need to install the app)
     echo " *** Login SUCCESS ****" >> $result_dir/login.log
 
 else
     # install the app
+    sleep 5 # wait for a few seconds before installation to avoid such error: "adb: connect error for write: closed"
     adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
     echo "** INSTALL APP (${AVD_SERIAL})"
 fi
 
-sleep 20
+sleep 15
 # install Fastbot
 adb -s $AVD_SERIAL push $FASTBOT_TOOL/monkeyq.jar /sdcard
 adb -s $AVD_SERIAL push $FASTBOT_TOOL/framework.jar /sdcard

scripts/run_newmonkey.sh

@@ -0,0 +1,140 @@
+#!/bin/bash
+
+APK_FILE=$1 # e.g., xx.apk
+AVD_SERIAL=$2 # e.g., emulator-5554
+AVD_NAME=$3 # e.g., base
+OUTPUT_DIR=$4
+TEST_TIME=$5 # e.g., 10s, 10m, 10h
+HEADLESS=$6 # e.g., -no-window
+LOGIN_SCRIPT=$7 # the script for app login via uiautomator2
+
+NEWMONKEY_TOOL=../tools/
+
+# wait for the target device
+function wait_for_device(){
+    avd_serial=$1
+    timeout 5s adb -s $avd_serial wait-for-device
+    OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    i=0
+    while [[ ${OUT:0:7}  != 'stopped' ]]; do
+      echo "   Waiting for emulator (${avd_serial}) to fully boot (#${i} times) ..."
+      sleep 5
+      i=$(expr $i + 1)
+      if [[ $i == 10 ]]
+      then
+            echo "Cannot connect to the device: (${avd_serial}) after (#${i} times)..."
+            break
+      fi
+      OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    done
+}
+
+RETRY_TIMES=5
+for i in $(seq 1 $RETRY_TIMES);
+do
+    echo "try to start the emulator (${AVD_SERIAL})..."
+    sleep 5
+    # start the emulator
+    avd_port=${AVD_SERIAL:9:13}
+    emulator -port $avd_port -avd $AVD_NAME -read-only $HEADLESS &
+    sleep 5
+    # wait for the emulator
+    wait_for_device $AVD_SERIAL
+
+    # check whether the emualtor is online
+    OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    if [[ ${OUT:0:7}  != 'stopped' ]]
+    then
+        adb -s $avd_serial emu kill
+        echo "try to restart the emulator (${AVD_SERIAL})..."
+        if [[ $i == RETRY_TIMES ]]
+        then
+            echo "we give up the emulator (${AVD_SERIAL})..."
+            exit
+        fi
+    else
+        break
+    fi
+done
+
+echo "  emulator (${AVD_SERIAL}) is booted!"
+adb -s ${AVD_SERIAL} root
+
+current_date_time="`date "+%Y-%m-%d-%H-%M-%S"`"
+apk_file_name=`basename $APK_FILE`
+result_dir=$OUTPUT_DIR/$apk_file_name.newmonkey.result.$AVD_SERIAL.$AVD_NAME\#$current_date_time
+mkdir -p $result_dir
+echo "** CREATING RESULT DIR (${AVD_SERIAL}): " $result_dir
+
+# login if necessary
+if [[ $LOGIN_SCRIPT != "" ]]
+then
+    echo "** APP LOGIN (${AVD_SERIAL})"
+
+    # enable if use the login script
+    adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
+    echo "** INSTALL APP (${AVD_SERIAL})"
+    python3 $LOGIN_SCRIPT ${AVD_SERIAL} 2>&1 | tee $result_dir/login.log
+
+    # enable if use the snapshot (already login, do not need to install the app)
+    echo " *** Login SUCCESS ****" >> $result_dir/login.log
+
+else
+    # install the app
+    sleep 5
+    adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
+    echo "** INSTALL APP (${AVD_SERIAL})"
+fi
+
+sleep 20
+
+# install New Monkey
+adb -s $AVD_SERIAL install $NEWMONKEY_TOOL/NewMonkey-3.4.apk 
+echo "** INSTALL NewMonkey (${AVD_SERIAL})"
+# get app package
+app_package_name=`aapt dump badging $APK_FILE | grep package | awk '{print $2}' | sed s/name=//g | sed s/\'//g`
+echo "** PROCESSING APP (${AVD_SERIAL}): " $app_package_name
+
+# start logcat
+echo "** START LOGCAT (${AVD_SERIAL}) "
+adb -s $AVD_SERIAL logcat -c
+adb -s $AVD_SERIAL logcat AndroidRuntime:E CrashAnrDetector:D System.err:W CustomActivityOnCrash:E ACRA:E WordPress-EDITOR:E *:F *:S > $result_dir/logcat.log &
+
+# start coverage dumping   !! i think it is useless, and should be deleted
+echo "** START COVERAGE (${AVD_SERIAL}) "
+bash dump_coverage.sh $AVD_SERIAL $app_package_name $result_dir &
+
+
+# run NewMonkey
+echo "** RUN NewMonkey (${AVD_SERIAL})"
+adb -s $AVD_SERIAL shell date "+%Y-%m-%d-%H:%M:%S" >> $result_dir/newmonkey_testing_time_on_emulator.txt
+
+adb -s $AVD_SERIAL shell am start -n com.tencent.newmonkey.newmonkeymobilewithnoroot/com.tencent.newmonkey.app.activity.MainActivity -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+adb shell pm grant com.tencent.newmonkey.newmonkeymobilewithnoroot android.permission.SYSTEM_ALERT_WINDOW
+adb shell settings put secure enabled_accessibility_services com.tencent.newmonkey.newmonkeymobilewithnoroot/com.tencent.newmonkey.core.frameworks.MonkeyService
+echo $app_package_name
+adb shell am broadcast --es packageName $app_package_name  com.tencent.newmonkey.newmonkeymobilewithnoroot/com.tencent.newmonkey.app.broadcast.AutoMonkeyReceiver
+sleep ${TEST_TIME}
+
+#停止monkey任务命令
+adb shell am broadcast --ez stopMonkey true com.tencent.newmonkey.newmonkeymobilewithnoroot/com.tencent.newmonkey.app.broadcast.AutoMonkeyReceiver
+
+adb -s $AVD_SERIAL shell date "+%Y-%m-%d-%H:%M:%S" >> $result_dir/newmonkey_testing_time_on_emulator.txt
+
+# pull NewMonkey's results
+echo "** PULL NewMonkey RESULTS (${AVD_SERIAL})"
+adb -s $AVD_SERIAL pull /sdcard/crash-dump.log $result_dir/
+
+# stop coverage dumping
+echo "** STOP COVERAGE (${AVD_SERIAL})"
+kill `ps aux | grep "dump_coverage.sh ${AVD_SERIAL}" | grep -v grep |  awk '{print $2}'`
+
+# stop logcat
+echo "** STOP LOGCAT (${AVD_SERIAL})"
+kill `ps aux | grep "${AVD_SERIAL} logcat" | grep -v grep | awk '{print $2}'`
+
+# stop and kill the emulator
+sleep 5
+adb -s $AVD_SERIAL emu kill
+
+echo "@@@@@@ Finish (${AVD_SERIAL}): " $app_package_name "@@@@@@@"

scripts/run_wetest.sh

@@ -0,0 +1,134 @@
+#!/bin/bash
+
+APK_FILE=$1 # e.g., xx.apk
+AVD_SERIAL=$2 # e.g., emulator-5554
+AVD_NAME=$3 # e.g., base
+OUTPUT_DIR=$4
+TEST_TIME=$5 # e.g., 10s, 10m, 10h
+HEADLESS=$6 # e.g., -no-window
+LOGIN_SCRIPT=$7 # the script for app login via uiautomator2
+
+WETEST_TOOL=../tools/
+
+# wait for the target device
+function wait_for_device(){
+    avd_serial=$1
+    timeout 5s adb -s $avd_serial wait-for-device
+    OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    i=0
+    while [[ ${OUT:0:7}  != 'stopped' ]]; do
+      echo "   Waiting for emulator (${avd_serial}) to fully boot (#${i} times) ..."
+      sleep 5
+      i=$(expr $i + 1)
+      if [[ $i == 10 ]]
+      then
+            echo "Cannot connect to the device: (${avd_serial}) after (#${i} times)..."
+            break
+      fi
+      OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    done
+}
+
+RETRY_TIMES=5
+for i in $(seq 1 $RETRY_TIMES);
+do
+    echo "try to start the emulator (${AVD_SERIAL})..."
+    sleep 5
+    # start the emulator
+    avd_port=${AVD_SERIAL:9:13}
+    emulator -port $avd_port -avd $AVD_NAME -read-only $HEADLESS &
+    sleep 5
+    # wait for the emulator
+    wait_for_device $AVD_SERIAL
+
+    # check whether the emualtor is online
+    OUT=`adb -s $avd_serial shell getprop init.svc.bootanim`
+    if [[ ${OUT:0:7}  != 'stopped' ]]
+    then
+        adb -s $avd_serial emu kill
+        echo "try to restart the emulator (${AVD_SERIAL})..."
+        if [[ $i == RETRY_TIMES ]]
+        then
+            echo "we give up the emulator (${AVD_SERIAL})..."
+            exit
+        fi
+    else
+        break
+    fi
+done
+
+echo "  emulator (${AVD_SERIAL}) is booted!"
+adb -s ${AVD_SERIAL} root
+
+current_date_time="`date "+%Y-%m-%d-%H-%M-%S"`"
+apk_file_name=`basename $APK_FILE`
+result_dir=$OUTPUT_DIR/$apk_file_name.WeTest.result.$AVD_SERIAL.$AVD_NAME\#$current_date_time
+mkdir -p $result_dir
+echo "** CREATING RESULT DIR (${AVD_SERIAL}): " $result_dir
+
+# login if necessary
+if [[ $LOGIN_SCRIPT != "" ]]
+then
+    echo "** APP LOGIN (${AVD_SERIAL})"
+
+    # enable if use the login script
+    # adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
+    # echo "** INSTALL APP (${AVD_SERIAL})"
+    # python3 $LOGIN_SCRIPT ${AVD_SERIAL} 2>&1 | tee $result_dir/login.log
+
+    # enable if use the snapshot (already login, do not need to install the app)
+    echo " *** Login SUCCESS ****" >> $result_dir/login.log
+
+else
+    # install the app
+    sleep 5 # wait for a few seconds before installation to avoid such error: "adb: connect error for write: closed"
+    adb -s $AVD_SERIAL install -g $APK_FILE &> $result_dir/install.log
+    echo "** INSTALL APP (${AVD_SERIAL})"
+fi
+
+sleep 20
+
+
+# get app package
+app_package_name=`aapt dump badging $APK_FILE | grep package | awk '{print $2}' | sed s/name=//g | sed s/\'//g`
+echo "** PROCESSING APP (${AVD_SERIAL}): " $app_package_name
+
+# start logcat
+echo "** START LOGCAT (${AVD_SERIAL}) "
+adb -s $AVD_SERIAL logcat -c
+adb -s $AVD_SERIAL logcat AndroidRuntime:E CrashAnrDetector:D System.err:W CustomActivityOnCrash:E ACRA:E WordPress-EDITOR:E *:F *:S > $result_dir/logcat.log &
+
+# start coverage dumping
+echo "** START COVERAGE (${AVD_SERIAL}) "
+bash dump_coverage.sh $AVD_SERIAL $app_package_name $result_dir &
+
+# run WeTest
+echo "** RUN WeTest (${AVD_SERIAL})"
+adb -s $AVD_SERIAL shell date "+%Y-%m-%d-%H:%M:%S" >> $result_dir/WeTest_testing_time_on_emulator.txt
+
+
+
+launchable_activity=$(aapt dump badging $APK_FILE | grep "launchable-activity" | awk '{print $2}' | sed s/name=//g | sed s/\'//g )
+
+
+timeout ${TEST_TIME} ./${WETEST_TOOL}/test_main ${apk_file_name} ${app_package_name} ${launchable_activity}
+
+adb -s $AVD_SERIAL shell date "+%Y-%m-%d-%H:%M:%S" >> $result_dir/wetest_testing_time_on_emulator.txt
+
+# pull WeTest's results
+echo "** PULL WeTest RESULTS (${AVD_SERIAL})"
+adb -s $AVD_SERIAL pull /sdcard/crash-dump.log $result_dir/
+
+# stop coverage dumping
+echo "** STOP COVERAGE (${AVD_SERIAL})"
+kill `ps aux | grep "dump_coverage.sh ${AVD_SERIAL}" | grep -v grep |  awk '{print $2}'`
+
+# stop logcat
+echo "** STOP LOGCAT (${AVD_SERIAL})"
+kill `ps aux | grep "${AVD_SERIAL} logcat" | grep -v grep | awk '{print $2}'`
+
+# stop and kill the emulator
+sleep 5
+adb -s $AVD_SERIAL emu kill
+
+echo "@@@@@@ Finish (${AVD_SERIAL}): " $app_package_name "@@@@@@@"

scripts/themis.py

@@ -121,6 +121,35 @@ def run_qtesting(apk, avd_serial, avd_name, output_dir, testing_time, screen_opt
     os.system(command)
 
 
+def run_fastbot(apk, avd_serial, avd_name, output_dir, testing_time, screen_option, login_script):
+    command = 'bash -x run_fastbot.sh %s %s %s %s %s %s %s' % (apk, avd_serial, avd_name,
+                                                               output_dir,
+                                                               testing_time,
+                                                               screen_option,
+                                                               login_script)
+    print('execute fastbot: %s' % command)
+    os.system(command)
+
+
+def run_newmonkey(apk, avd_serial, avd_name, output_dir, testing_time, screen_option, login_script):
+    command = 'bash -x run_newmonkey.sh %s %s %s %s %s %s %s' % (os.path.abspath(apk), avd_serial, avd_name,
+                                                                os.path.abspath(output_dir),
+                                                                testing_time,
+                                                                screen_option,
+                                                                login_script)
+    print('execute newmonkey: %s' % command)
+    os.system(command)
+
+def run_wetest(apk, avd_serial, avd_name, output_dir, testing_time, screen_option, login_script):
+    command = 'bash -x run_wetest.sh %s %s %s %s %s %s %s' % (os.path.abspath(apk), avd_serial, avd_name,
+                                                                os.path.abspath(output_dir),
+                                                                testing_time,
+                                                                screen_option,
+                                                                login_script)
+    print('execute wetest: %s' % command)
+    os.system(command)
+
+
 def get_all_apks(apk_list_file):
     file = open(apk_list_file, 'r')
     apk_paths = []
@@ -239,6 +268,19 @@ def main(args: Namespace):
                 p.apply_async(run_qtesting, args=(current_apk, avd_serial, args.avd_name,
                                                   args.o, args.time, screen_option,
                                                   login_script,))
+
+            elif args.fastbot:
+                p.apply_async(run_fastbot, args=(current_apk, avd_serial, args.avd_name,
+                                                 args.o, args.time, screen_option,
+                                                 login_script,))
+            elif args.newmonkey:
+                p.apply_async(run_fastbot, args=(current_apk, avd_serial, args.avd_name,
+                                                  args.o, args.time, screen_option,
+                                                  login_script,))
+            elif args.wetest:
+                p.apply_async(run_fastbot, args=(current_apk, avd_serial, args.avd_name,
+                                                  args.o, args.time, screen_option,
+                                                  login_script,))                
             else:
                 pass
 
@@ -281,8 +323,11 @@ if __name__ == '__main__':
     ap.add_argument('--sapienz', default=False, action='store_true')
     ap.add_argument('--qtesting', default=False, action='store_true')
     ap.add_argument('--weighted', default=False, action='store_true')
+    ap.add_argument('--fastbot', default=False, action='store_true')
+    ap.add_argument('--wetest', default=False, action='store_true')
+    ap.add_argument('--newmonkey', default=False, action='store_true')
 
-    ap.add_argument('--offset', type=int, default=0, help="device offset number w.r.t emulator-5554")
+    ap.add_argument('--offset', type=int, default=0, help="device offset number")
 
     args = ap.parse_args()