Merge lp://qastaging/~liuyq0307/lava-android-test/methanol into lp://qastaging/lava-android-test

change to use BaseHTTPServer to server the web pages and cgi server

This branch has been tested on staging. Please see the following jobs:
http://staging.validation.linaro.org/scheduler/job/25406
http://staging.validation.linaro.org/scheduler/job/25407

On 08/09/2012 08:45 AM, Yongqin Liu wrote:
> === added directory 'lava_android_test/test_definitions/methanol'
> === added file 'lava_android_test/test_definitions/methanol.py'
> --- lava_android_test/test_definitions/methanol.py 1970-01-01 00:00:00 +0000
> +++ lava_android_test/test_definitions/methanol.py 2012-08-09 11:16:19 +0000
<snip>
> + def real_parse(self, result_filename=None, output_filename='methanol_result.json',
> + test_name=''):
> + """Parse test output to gather results
> + Use the pattern specified when the class was instantiated to look
> + through the results line-by-line and find lines that match it.
> + Results are then stored in self.results. If a fixupdict was supplied
> + it is used to convert test result strings to a standard format.
> + """

Seems like this comment should go in the parent's implementation rather
than this one.

> === added file 'lava_android_test/test_definitions/methanol/methanol.sh'
> --- lava_android_test/test_definitions/methanol/methanol.sh 1970-01-01 00:00:00 +0000
> +++ lava_android_test/test_definitions/methanol/methanol.sh 2012-08-09 11:16:19 +0000

<snip>

> +#the default ip or domain used by the client to access the server
> +domain_ip='192.168.1.10'

Why should we have to have a default. We can figure out our own IP
address. Actually the python server you wrote figures it out, so maybe
we should just get it from the file it creates for us.

> +########################################################
> +###### NOT MODIFY SOURCE OF BELOW #####
> +########################################################
> +#android_dir="/sdcard/methanol"
Remove this line if its not needed anymore

<snip>
> +
> +function deploy(){
> + cur_path=`pwd`
> + target_dir=`mktemp -u --tmpdir=${cur_path} methanol-XXX`
> + git clone "${methanol_git}" "${target_dir}"
> + if [ $? -ne 0 ];then
> + echo "Faile to clone the methanol source from ${methanol_git}"
typo "Faile" should be "Failed"
> + cleanup
> + exit 1
> + fi

> +function test_methanol(){
> + if [ -n "$1" ]; then
> + test_type="-${1}"
> + else
> + test_type=""
> + fi
> +
> + wait_minutes=${2-1}
> +
> + mkdir -p/tmp/methanol/
> + sudo chmod -R 777 /tmp/methanol

Do we really need /tmp/methanol? this is just something we'll create and
never clean up.

> === modified file 'lava_android_test/testdef.py'
> --- lava_android_test/testdef.py 2012-06-28 09:52:29 +0000
> +++ lava_android_test/testdef.py 2012-08-09 11:16:19 +0000

> @@ -410,6 +414,25 @@
> Results are then stored in self.results. If a fixupdict was supplied
> it is used to convert test result strings to a standard format.
> """
> +
> + self.real_parse(result_filename=result_filename,
> + output_filename=output_filename, test_name=test_name)
> +
> + self.fixresults(self.fixupdict)
> + if self.appendall:
> + self.appendtoall(self.appendall)
> + self.fixmeasurements()
> + self.fixids(test_name=test_name)
> +
> + def real_parse(self, result_filename='stdout.log',
> + ...

> > +#the default ip or domain used by the client to access the server
> > +domain_ip='192.168.1.10'
>
> Why should we have to have a default. We can figure out our own IP
> address. Actually the python server you wrote figures it out, so maybe
> we should just get it from the file it creates for us.
Sorry, could you show me how to figure out the available IP?
Using the ifconfig command to get the IP of eth0 is possible, but if the server has more than 2 IPs,
then we can't know which one is the right.
and if we pass 0.0.0.0, then all the IP address will be opened,
and this will cause security problems I think.

> > + mkdir -p/tmp/methanol/
> > + sudo chmod -R 777 /tmp/methanol
>
> Do we really need /tmp/methanol? this is just something we'll create and
> never clean up.
we can't pass a path(including /) to the save_methanol_data.py when using CGIHTTPServer as the server.
so we passed only the file name and get the result file from the default directory /tmp/methanol.
I delete the above two sentence, but the "/tmp/methanol" directory will still exist and won't be deleted.

> > + def real_parse(self, result_filename='stdout.log',
> > + output_filename='stdout.log', test_name=''):
> > + """Parse test output to gather results
> > +
> > + Use the pattern specified when the class was instantiated to look
> > + through the results line-by-line and find lines that match it.
> > + Results are then stored in self.results. If a fixupdict was
> supplied
> > + it is used to convert test result strings to a standard format.
> > + """
>
> There are a few other places in code that could use this function. I
> think: tjbench.py, skia.py, and 0xbench.py. We should fix those up as well.
yes, they are the same type, but here I'd like to leave them as they are now, not to touch them here.
we can update them when we need to update them in the future using this function,
and use this function when add new similar type test.

Thanks,
Yongqin Liu.

On 08/10/2012 10:18 PM, Yongqin Liu wrote:
>>> > >+#the default ip or domain used by the client to access the server
>>> > >+domain_ip='192.168.1.10'
>> >
>> >Why should we have to have a default. We can figure out our own IP
>> >address. Actually the python server you wrote figures it out, so maybe
>> >we should just get it from the file it creates for us.
> Sorry, could you show me how to figure out the available IP?
> Using the ifconfig command to get the IP of eth0 is possible, but if the server has more than 2 IPs,
> then we can't know which one is the right.
> and if we pass 0.0.0.0, then all the IP address will be opened,
> and this will cause security problems I think.
>

I think 0.0.0.0 is okay, we have firewalls to prevent access to the port
it will open.

Andy Doan <email address hidden> writes:

> On 08/10/2012 10:18 PM, Yongqin Liu wrote:
>>>> > >+#the default ip or domain used by the client to access the server
>>>> > >+domain_ip='192.168.1.10'
>>> >
>>> >Why should we have to have a default. We can figure out our own IP
>>> >address. Actually the python server you wrote figures it out, so maybe
>>> >we should just get it from the file it creates for us.
>> Sorry, could you show me how to figure out the available IP?
>> Using the ifconfig command to get the IP of eth0 is possible, but if the server has more than 2 IPs,
>> then we can't know which one is the right.
>> and if we pass 0.0.0.0, then all the IP address will be opened,
>> and this will cause security problems I think.
>>
>
> I think 0.0.0.0 is okay, we have firewalls to prevent access to the port
> it will open.

That still doesn't help the test know which IP address to give to the
browser on the DUT...

Cheers,
mwh