Merge lp:~liuyq0307/lava-android-test/modify4mmtest into lp:lava-android-test

[Yongqin Liu]

did two things
1. modify the level of wget so that we can get the sub directory
2. modify the location that to put media files, so that the apk and see the files

[Zygmunt Krynicki (zyga)]

5 -# Copyright (c) 2011 Linaro
6 -
7 +# Copyright (C) 2012 Linaro Limited
8 +#

You should append the date, don't remove older year numbers (so 2011-2012 or 2011, 2012)

23 -RUN_STEPS_HOST_PRE = ['wget -r -np -l 2 -R csv,txt,css,html,gif %s -P %s' % (site, local_name),
24 +RUN_STEPS_HOST_PRE = ['wget -r -np -l 10 -R csv,txt,css,html,gif,pdf %s -P %s' % (site, local_name),

While not critical using the long option names and would make this part much easier to understand. Also, by
keeping the formatting per-argument you avoid white-space bugs and keep formatting operator closer to where it is used. I did not check if this is possible in our current dispatcher interface but still this makes it readable.

[ 'wget', '--recursive', '--no-parent', '--level=20', '--reject csv,txt,css,html,gif,pdf', '--directory-prefix=%s' % local_name, site]

Still, a +1

review: Approve

[Yongqin Liu (liuyq0307)]

> 5 -# Copyright (c) 2011 Linaro
> 6 -
> 7 +# Copyright (C) 2012 Linaro Limited
> 8 +#
>
> You should append the date, don't remove older year numbers (so 2011-2012 or
> 2011, 2012)

Thanks!
>
> 23 -RUN_STEPS_HOST_PRE = ['wget -r -np -l 2 -R csv,txt,css,html,gif %s -P
> %s' % (site, local_name),
> 24 +RUN_STEPS_HOST_PRE = ['wget -r -np -l 10 -R csv,txt,css,html,gif,pdf
> %s -P %s' % (site, local_name),
>
> While not critical using the long option names and would make this part much
> easier to understand. Also, by
> keeping the formatting per-argument you avoid white-space bugs and keep
> formatting operator closer to where it is used. I did not check if this is
> possible in our current dispatcher interface but still this makes it readable.
>
> [ 'wget', '--recursive', '--no-parent', '--level=20', '--reject
> csv,txt,css,html,gif,pdf', '--directory-prefix=%s' % local_name, site]

with the string format, we can do some substitutions in the command simply.
like such command:
   RUN_STEPS_HOST_PRE = ['/bin/bash %s $(SERIAL)' % test_sh_path]
we can replace the $(SERIAL) with the real device serial number easily.

but, yes, this format will cause white-space bugs easier.
we need to pay attention to this point.:(

=== modified file 'lava_android_test/test_definitions/mmtest.py'
--- lava_android_test/test_definitions/mmtest.py	2011-12-30 09:22:23 +0000
+++ lava_android_test/test_definitions/mmtest.py	2012-01-30 12:20:43 +0000
@@ -1,5 +1,5 @@
-# Copyright (c) 2011 Linaro
-
+# Copyright (C) 2012 Linaro Limited
+#
 # Author: Linaro Validation Team <[e-mail]>
 #
 # This file is part of LAVA Android Test.
@@ -21,19 +21,24 @@
 import re
 import lava_android_test.testdef
 from lava_android_test.utils import get_local_name
+from lava_android_test.config import get_config
 
 test_name = 'mmtest'
+config = get_config()
 
 site = 'http://samplemedia.linaro.org/'
 local_name = get_local_name(site)
-RUN_STEPS_HOST_PRE = ['wget -r -np -l 2 -R csv,txt,css,html,gif %s -P %s' % (site, local_name),
+RUN_STEPS_HOST_PRE = ['wget -r -np -l 10 -R csv,txt,css,html,gif,pdf %s -P %s' % (site, local_name),
                       r'find  %s -type f -name "index*" -exec rm -f \{\} \;' % local_name,
                       r'find  %s -type f -name "README" -exec rm -f \{\} \;' % local_name]
-test_files_target_path = os.path.join('/sdcard', local_name)
+
+test_files_target_path = os.path.join(config.installdir_android,
+                                    test_name, local_name)
 RUN_STEPS_ADB_PRE = ['push %s %s' % (local_name, test_files_target_path)]
 RUN_ADB_SHELL_STEPS = ['am instrument -r -e targetDir %s \
     -w com.android.mediaframeworktest/.MediaFrameworkTestRunner'
-     % test_files_target_path]
+     % test_files_target_path,
+    'rm -r %s' % (test_files_target_path) ]
 
 class MMTestTestParser(lava_android_test.testdef.AndroidTestParser):