commit 00280b9fd4e1f94290b75d2a5c1ea7d17c284ea5
author Mike Mason <michael.w.mason@intel.com> Mon Apr 24 11:27:45 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Apr 28 22:25:43 2017 -0700
tree 59ac1633c7987f756315441462f00e6f3095866c
parent a1a38fc316ef45e20f0174a35e48e5452a4212f8

[autotest] Adapt suite_enumerator.py to changes in suite.py

Changes in server/cros/dynamic_suite/suite.py broke the feature
in suite_enumerator.py that prints the tests in a suite. This patch
fixes that, calls create_fs_getter and list_all_suites outside of
the Suite class (calling in the class is deprecated), and removes
checks for experimental tests, which are no longer supported.

BUG=b/36296378,chromium:710923
TEST=./suite_enumerator.py -a ../ graphics

Change-Id: Ic11249d4b52bafb3a7656f2d51d1921908d5062d
Signed-off-by: Mike Mason <michael.w.mason@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/486219
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Michael W Mason <michael.w.mason@intel.com>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>

site_utils/suite_enumerator.py

diff --git a/site_utils/suite_enumerator.py b/site_utils/suite_enumerator.py
index 6e613ea..ea80d9a 100755
--- a/site_utils/suite_enumerator.py
+++ b/site_utils/suite_enumerator.py
@@ -27,8 +27,9 @@
 logging.basicConfig(level=logging.INFO)
 
 import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite.suite import Suite
+import autotest_lib.client.common_lib.cros as cros_lib
+import autotest_lib.server.cros.dynamic_suite.suite as suite_lib
+
 
 def parse_options():
     """Parse command line for arguments including autotest directory, suite
@@ -60,23 +61,24 @@
         parser.print_help()
         return
 
-    fs_getter = Suite.create_fs_getter(options.autotest_dir)
-    devserver = dev_server.ImageServer('')
+    fs_getter = suite_lib.create_fs_getter(options.autotest_dir)
+    devserver = cros_lib.dev_server.ImageServer('')
     if options.listall:
-        for suite in Suite.list_all_suites('', devserver, fs_getter):
+        for suite in suite_lib.list_all_suites('', devserver, fs_getter):
             print suite
         return
 
-    suite = Suite.create_from_name(args[0], {}, '', devserver, fs_getter)
+    suite = suite_lib.Suite.create_from_name(args[0], {}, '', devserver,
+                                             fs_getter)
     # If in test list, print firmware_FAFTSetup before other tests
     # NOTE: the test.name value can be *different* from the directory
     # name that appears in test.path
     PRETEST_LIST = ['firmware_FAFTSetup',]
     for test in filter(lambda test: test.name in \
-                              PRETEST_LIST, suite.stable_tests):
+                              PRETEST_LIST, suite.tests):
         print test.path
     for test in filter(lambda test: test.name not in \
-                       PRETEST_LIST, suite.stable_tests):
+                       PRETEST_LIST, suite.tests):
         print test.path
 
     # Check if test_suites/control.suite_name exists.