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

Subscribers

People subscribed via source and target branches