LAVA Android Test

Merge lp:~vishalbhoj/lava-android-test/update-methanol into lp:lava-android-test

  1. update-methanol
  2. Merge into trunk
Proposed by vishal
Status: Merged
Merged at revision: 263
Proposed branch: lp:~vishalbhoj/lava-android-test/update-methanol
Merge into: lp:lava-android-test
Diff against target: 41 lines (+4/-5)
2 files modified
lava_android_test/test_definitions/methanol.py (+1/-2)
lava_android_test/test_definitions/methanol/methanol.sh (+3/-3)
To merge this branch: bzr merge lp:~vishalbhoj/lava-android-test/update-methanol
Reviewer Review Type Date Requested Status
Yongqin Liu Approve
Review via email: mp+186239@code.launchpad.net

Description of the change

Fixes Methanol tests.

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/methanol.py'
2--- lava_android_test/test_definitions/methanol.py 2013-05-16 09:05:03 +0000
3+++ lava_android_test/test_definitions/methanol.py 2013-09-18 04:02:52 +0000
4@@ -62,5 +62,4 @@
5 parser = MethanolTestParser()
6 testobj = lava_android_test.testdef.AndroidTest(testname="methanol",
7 installer=inst, runner=run, parser=parser,
8- org_ouput_file='/data/local/methanol/methanol_result.json',
9- default_options='-b DEFAULT -d 192.168.1.10')
10+ org_ouput_file='/data/local/methanol/methanol_result.json')
11
12=== modified file 'lava_android_test/test_definitions/methanol/methanol.sh'
13--- lava_android_test/test_definitions/methanol/methanol.sh 2012-11-08 06:02:28 +0000
14+++ lava_android_test/test_definitions/methanol/methanol.sh 2013-09-18 04:02:52 +0000
15@@ -19,7 +19,7 @@
16 # along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18 #the default ip or domain used by the client to access the server
19-DEFAULT_DOMAIN_IP='192.168.1.10'
20+DEFAULT_DOMAIN_IP=`ifconfig | awk -F':' '/inet addr/&&!/127.0.0.1/{split($2,_," ");print _[1]}'`
21 DEFAULT_BROWSER='DEFAULT'
22
23 ########################################################
24@@ -29,7 +29,7 @@
25 methanol_git="git://github.com/szeged/methanol.git"
26 chrome_apk_url="http://testdata.validation.linaro.org/chrome/Chrome-latest.apk"
27 server_settings_file="/etc/lava/web_server/settings.conf"
28-result_dir_android="/data/local/methanol"
29+result_dir_android="/data/local/tmp/methanol"
30 declare -a RESULTS=();
31 methanol_url="/"
32 report_url="/cgi/save_methanol_data.py"
33@@ -253,7 +253,7 @@
34 test_url="${test_url}?reportToUrl=${report_url}%3Fsave2file=${res_basename}"
35 fi
36
37- component_default="com.android.browser/.BrowserActivity"
38+ component_default="com.google.android.browser/com.android.browser.BrowserActivity"
39 component_chrome=" com.android.chrome/com.google.android.apps.chrome.Main"
40 if [ "${browser}" = "CHROME" ]; then
41 component=${component_chrome}

Subscribers

People subscribed via source and target branches