Merge lp:~liuyq0307/lava-android-test/exclude-shells-commands-hostshells-test-from-list into lp:lava-android-test

[Yongqin Liu]

 exclue the shells/commands/hostshells test from the list-tests command

 these three tests(shells/commands/hostshells)are not the real test,
 and so that they can not be installed and run, so here is the fix to
 exclude them from the list-tests sub command

[Andy Doan (doanac)]

This is change concerns me a bit:

> def list_test(self):
> - return self.list_mod(test_definitions.__path__)
> + providers = self.get_test_provider_list()
> + avoid_dirs = []
> + for provider in providers:
> + test_prefix = provider.test_prefix
> + if test_prefix:
> + avoid_dirs.append('%ss' % test_prefix)
> + test_list = self.list_mod(test_definitions.__path__)
> + if not avoid_dirs:
> + return test_list
> + else:
> + ret_list = []
> + for test_id in test_list:
> + if not test_id in avoid_dirs:
> + ret_list.append(test_id)
> + return ret_list
>

The way avoid_dirs gets built is based on your current naming
convention. Instead of guessing avoid dirs that way, why not do
something like:

  def _get_dirs(pathname):
    return [x for x in os.listdir(pathname) if os.path.isdir(x)]

then you could just do:
   avoid_dirs = _get_dirs(test_definitions.__path__)

I'm not a big fan of the logic for removing those items from the list.
The "if not avoid_dirs:" check isn't needed.

[lp:~liuyq0307/lava-android-test/exclude-shells-commands-hostshells-test-from-list]

233. By Yongqin Liu on 2013-01-22

merge with trunk

234. By Yongqin Liu on 2013-01-22

keep the original change of provider.py for review

Unmerged revisions

234. By Yongqin Liu on 2013-01-22

keep the original change of provider.py for review

233. By Yongqin Liu on 2013-01-22

merge with trunk

=== modified file 'lava_android_test/provider.py'
--- lava_android_test/provider.py	2013-01-22 16:30:42 +0000
+++ lava_android_test/provider.py	2013-01-22 17:13:19 +0000
@@ -113,7 +113,21 @@
 class CommonTestProvider(TestProvider):
 
     def list_test(self):
-        return self.list_mod(test_definitions.__path__)
+        providers = self.get_test_provider_list()
+        avoid_dirs = []
+        for provider in providers:
+            test_prefix = provider.test_prefix
+            if test_prefix:
+                avoid_dirs.append('%ss' % test_prefix)
+        test_list = self.list_mod(test_definitions.__path__)
+        if not avoid_dirs:
+            return test_list
+        else:
+            ret_list = []
+            for test_id in test_list:
+                if not test_id in avoid_dirs:
+                    ret_list.append(test_id)
+            return ret_list
 
     def load_test(self, test_name=None, serial=None):
         importpath = "lava_android_test.test_definitions.%s" % test_name
@@ -231,7 +245,7 @@
                                 steps_adb_pre=INSTALL_STEPS_ADB_PRE),
                     runner=testdef.AndroidTestRunner(
                                     adbshell_steps=ADB_SHELL_STEPS),
-                    parser=testdef.AndroidSimpleTestParser(PATTERN),
+                    parser=testdef.AndroidSimpleTestParser(),
                     adb=ADB(serial))
         return testobj
 
@@ -273,4 +287,3 @@
                     parser=testdef.AndroidSimpleTestParser(),
                     adb=ADB(serial))
         return testobj
-