Merge lp:~liuyq0307/lava-android-test/connect-lab-wifi into lp:lava-android-test

[Yongqin Liu]

Add the test to connect the wifi of lava lab.
Want to use the
    /srv/lava/instances/$INSTANCE/etc/lava-server/settings.conf
to set the WIFI_DEV_CONF environment variable,
but it seems not work when run the test via instance job.
the value of WIFI_DEV_CONF can't be gotten.
Don't know why.:(

[lp:~liuyq0307/lava-android-test/connect-lab-wifi]

187. By Yongqin Liu on 2012-07-10

modify the bugs that not get the serial number when using configuration file

[Michael Hudson-Doyle (mwhudson)]

It looks OK to me (modulo hardcoding where the config is for now), but I still don't know the codebase all that well.

review: Approve

[Yongqin Liu (liuyq0307)]

> It looks OK to me (modulo hardcoding where the config is for now), but I still
> don't know the codebase all that well.

Thanks, and there is another branch about the docs, may be from there you can know more about the code.

I will merge this branch first.

Thanks.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-06-28 09:52:29 +0000
+++ MANIFEST.in	2012-07-10 08:27:18 +0000
@@ -12,4 +12,5 @@
 include lava_android_test/test_definitions/ime/*
 include lava_android_test/test_definitions/pm-qa/*
 include lava_android_test/test_definitions/shells/*
+include lava_android_test/test_definitions/hostshells/*
 
 
=== modified file 'lava_android_test/provider.py'
--- lava_android_test/provider.py	2012-06-16 05:42:51 +0000
+++ lava_android_test/provider.py	2012-07-10 08:27:18 +0000
@@ -224,7 +224,7 @@
                      'shell chmod 777 %s' % test_sh_android_path]
 
         ADB_SHELL_STEPS = ['%s $(OPTIONS)' % test_sh_android_path]
-        PATTERN = ("^\s*(?P<test_case_id>\w+)="
+        PATTERN = ("^\s*(?P<test_case_id>\S+)="
                    "(?P<result>(pass|fail|ok|ng|true|false|skip|done))\s*$")
 
         testobj = self.gen_testobj(
@@ -236,3 +236,45 @@
                     parser=testdef.AndroidTestParser(PATTERN),
                     adb=ADB(serial))
         return testobj
+
+
+class HostShellTestProvider(TestProvider):
+
+    test_prefix = 'hostshell'
+    config = get_config()
+    dotext = '.sh'
+
+    def list_test(self):
+        dotext = '.sh'
+        mod = self.import_mod("lava_android_test.test_definitions.hostshells")
+        sh_files = find_files(mod.curdir, dotext)
+        test_list = []
+        for f in sh_files:
+            ##Assume that the file name only has one '.sh'
+            f_name_no_dotext = os.path.basename(f).replace(dotext, '')
+            test_list.append('%s-%s' % (self.test_prefix, f_name_no_dotext))
+        return test_list
+
+    def load_test(self, test_name=None, serial=None):
+        if not test_name.startswith('%s-' % self.test_prefix):
+            raise UnfoundTest('The test(%s) is not found!' % test_name)
+        f_name_no_prefix = test_name.replace('%s-' % self.test_prefix, '', 1)
+
+        mod = self.import_mod("lava_android_test.test_definitions.%ss" %
+                            self.test_prefix)
+        f_name = '%s%s' % (f_name_no_prefix, self.dotext)
+        test_sh_path = '%s/%s' % (mod.curdir, f_name)
+
+        HOST_SHELL_STEPS = ['bash %s -s $(SERIAL) $(OPTIONS)' % test_sh_path]
+        PATTERN = ("^\s*(?P<test_case_id>\S+)="
+                   "(?P<result>(pass|fail|ok|ng|true|false|skip|done))\s*$")
+
+        testobj = self.gen_testobj(
+                    testname=test_name,
+                    installer=testdef.AndroidTestInstaller(),
+                    runner=testdef.AndroidTestRunner(
+                                    steps_host_pre=HOST_SHELL_STEPS),
+                    parser=testdef.AndroidTestParser(PATTERN),
+                    adb=ADB(serial))
+        return testobj
+
 
=== added directory 'lava_android_test/test_definitions/hostshells'
=== added file 'lava_android_test/test_definitions/hostshells/__init__.py'
--- lava_android_test/test_definitions/hostshells/__init__.py	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/hostshells/__init__.py	2012-07-10 08:27:18 +0000
@@ -0,0 +1,2 @@
+import os
+curdir = os.path.dirname(os.path.realpath(__file__))
 
=== added file 'lava_android_test/test_definitions/hostshells/connect-lab-wifi.sh'
--- lava_android_test/test_definitions/hostshells/connect-lab-wifi.sh	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/hostshells/connect-lab-wifi.sh	2012-07-10 08:27:18 +0000
@@ -0,0 +1,168 @@
+#!/bin/bash
+# Copyright (c) 2012 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/>.
+
+function generate_wpa_conf(){
+    conf=$1 && ssid=$2 passwd=$3
+    if [ -z "${conf}" ];then
+        return
+    fi
+
+    if [ -z "${ssid}" ]; then
+        cat >wpa_supplicant.conf <<__EOF__
+ctrl_interface=wlan0
+update_config=1
+device_type=0-00000000-0
+
+__EOF__
+
+    elif [ -z "${passwd}" ]; then
+        cat >wpa_supplicant.conf <<__EOF__
+ctrl_interface=wlan0
+update_config=1
+device_type=0-00000000-0
+
+network={
+	ssid="${ssid}"
+	key_mgmt=NONE
+	priority=2
+}
+
+__EOF__
+
+    else
+        cat >wpa_supplicant.conf <<__EOF__
+ctrl_interface=wlan0
+update_config=1
+device_type=0-00000000-0
+
+network={
+	ssid="${ssid}"
+	psk="${passwd}"
+	key_mgmt=WPA-PSK
+	priority=2
+}
+
+__EOF__
+
+    fi
+}
+
+function enable_wifi(){
+    conf=$1 && ssid=$2 && serial=$3
+    if [ -z "${conf}" ]; then
+        return
+    fi
+    ADB_OPTION=""
+    if [ -n "${serial}" ]; then
+        ADB_OPTION="-s ${serial}"
+    fi
+
+    adb ${ADB_OPTION} shell am start -a android.intent.action.MAIN -n com.android.settings/.Settings
+    sleep 3
+    adb ${ADB_OPTION} shell service call wifi 13 i32 0
+    sleep 5
+    adb ${ADB_OPTION} push "${conf}" /data/misc/wifi/wpa_supplicant.conf
+    adb ${ADB_OPTION} shell chown wifi.wifi /data/misc/wifi/wpa_supplicant.conf
+    adb ${ADB_OPTION} shell chmod 660 /data/misc/wifi/wpa_supplicant.conf
+    adb ${ADB_OPTION} shell ls -l /data/misc/wifi/wpa_supplicant.conf
+    adb ${ADB_OPTION} shell service call wifi 13 i32 1
+    sleep 30
+    for i in {1..30}; do
+        adb ${ADB_OPTION} shell wpa_cli list_networks|grep -E "^\s*[[:digit:]]+\s+${ssid}\s+any\s+\[CURRENT\]"
+        if [ $? -eq 0 ];then
+            break
+        fi
+        sleep 2
+    done
+
+    if [ $i -eq 30 ]; then
+        echo "connect-lava-wifi-${ssid}=fail"
+        return 1
+    else
+        echo "connect-lava-wifi-${ssid}=pass"
+        return 0
+    fi
+}
+
+function parse_argv() {
+    # Parse command line arguments
+    # Sets: VERBOSE, dev
+    while test -n "$1"; do
+        case "$1" in
+            --serial|-s)
+                SERIAL="$2"
+                shift 2
+                ;;
+            --passwd|-p)
+                PASSWD="$2"
+                shift 2
+                ;;
+            *)
+                if [ -n "${SSID}" ]; then
+                    show_usage
+                    exit 1
+                else
+                    SSID="$1"
+                    shift
+                fi
+                ;;
+        esac
+    done
+}
+
+function show_usage(){
+    # Display the usage line
+    echo "Usage 1, Specify the ssid and pawword via command line:"
+    echo "    $0 [--passwd|-p passwd] [--serial|-s serial] ssid"
+    echo "Usage 2, Specify the ssid and pawword via configuration file:"
+    echo "    Specify the file path via 'WIFI_DEV_CONF' environment variable,"
+    echo "    /etc/lava/devices/wifi.conf is the default value if not specified"
+    echo "    The content of this file like this:"
+    echo "    SSID=the ssid of wifi"
+    echo "    PASSWD=the password of the specified wifi via SSID"
+}
+
+function main(){
+    if [ -z "${WIFI_DEV_CONF}" ]; then
+        wifi_dev_conf="/etc/lava/devices/wifi.conf"
+    else
+        wifi_dev_conf="${WIFI_DEV_CONF}"
+    fi
+
+    echo "Will use ${wifi_dev_conf} as the configuration file for wifi if exists"
+    if [ -f "${wifi_dev_conf}" ]; then
+        . "${wifi_dev_conf}"
+    fi
+    parse_argv "$@"
+
+    if [ -z "${SSID}" ]; then
+        show_usage
+        exit 1
+    fi
+
+    wifi_conf="wpa_supplicant.conf"
+    generate_wpa_conf "${wifi_conf}" "${SSID}" "${PASSWD}"
+    enable_wifi "${wifi_conf}" "${SSID}" "${SERIAL}"
+    RET=$?
+    rm -f "${wifi_conf}"
+    exit $RET
+}
+
+main "$@"
 
=== added file 'lava_android_test/test_definitions/hostshells/example.sh'
--- lava_android_test/test_definitions/hostshells/example.sh	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/hostshells/example.sh	2012-07-10 08:27:18 +0000
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Copyright (c) 2012 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/>.
+
+function parse_argv() {
+    # Parse command line arguments
+    while test -n "$1"; do
+        case "$1" in
+            --serial|-s)
+                SERIAL="$2"
+                if [ -n "${SERIAL}" ]; then
+                    shift 2
+                else
+                    shift 1
+                fi
+                ;;
+            --help|-h)
+                show_usage
+                exit 1
+                ;;
+            *)
+                if [ -n "${OPTIONS}" ]; then
+                    OPTIONS="${OPTIONS} $1"
+                else
+                    OPTIONS="$1"
+                fi
+                shift
+                ;;
+        esac
+    done
+}
+
+function show_usage(){
+    # Display the usage line
+    echo "Usage $0 [--serial|-s serial] other-option"
+    echo "Usage $0 [--help|-h]"
+}
+
+function main(){
+    parse_argv "$@"
+    echo "hostshells-example-fail=fail"
+    echo "hostshells-example-pass=pass"
+}
+
+main "$@"