Simplify objects passed to the result stage

expect_tests/handle_list.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from expect_tests.type_definitions import Handler
+from expect_tests.type_definitions import Handler, Test, FakeTest, MultiTest

[dnj, 2014/09/12 17:35:37]

Since FakeTest is only generated/used here, it would make sense to move its
definition into this module.

[pgervais, 2014/09/12 21:28:30]

True, but I'd rather keep all definitions together, for convenience.

[dnj, 2014/09/12 21:35:06]

I see your your point. As a counterpoint, I think putting it alongside the first
class test classes is confusing, implying that is useful in a larger context
when it is, in fact, constructed and utilized in only that one module.

Isolating it there gives it context and removes the ambiguity.

I'm fine either way; this just seems more intuitive to me.

 
 
 class ListHandler(Handler):
   """List all of the tests instead of running them."""
   SKIP_RUNLOOP = True
 
   # Used to collect all bare test names for command line test name completion.
   COMPLETION_LIST = None
 
   class ResultStageHandler(Handler.ResultStageHandler):
     @staticmethod
-    def handle_Test(test):
+    def handle_FakeTest(test):
       if ListHandler.COMPLETION_LIST is not None:
         ListHandler.COMPLETION_LIST.append(test.name)
       else:
         print test.name
 
     @staticmethod
     def handle_MultiTest(multi_test):
       print 'MultiTest(%r, atomic=%r)' % (multi_test.name, multi_test.atomic)
       for test in multi_test.tests:
         if ListHandler.COMPLETION_LIST is not None:
           ListHandler.COMPLETION_LIST.append(test.name)
         else:
           print '|', test.name
 
     # TODO(iannucci): group tests by dir?
     # TODO(iannucci): print more data about the test in verbose mode?
+
+  @classmethod
+  def gen_stage_loop(cls, _opts, tests, put_next_stage, _put_result_stage):
+    """Called in the GenStage portion of the pipeline.
+
+    @param opts: Parsed CLI options
+    @param tests:
+        Iterable of type_definitions.Test or type_definitions.MultiTest
+        objects.
+    @param put_next_stage:
+        Function to push an object to the next stage of the pipeline (RunStage).
+        Note that you should push the item you got from |tests|, not the
+        subtests, in the case that the item is a MultiTest.
+    @param put_result_stage:
+        Function to push an object to the result stage of the pipeline.
+    """
+    for test in tests:
+      if isinstance(test, Test):
+        test = FakeTest(name=test.name,
+                        func_call=None,
+                        expect_dir=test.expect_dir,
+                        expect_base=test.expect_base,
+                        ext=test.ext,
+                        covers=None,
+                        breakpoints=None)
+
+      elif isinstance(test, MultiTest):
+        all_tests = [FakeTest(name=one_test.name,
+                              func_call=None,
+                              expect_dir=one_test.expect_dir,
+                              expect_base=one_test.expect_base,
+                              ext=one_test.ext,
+                              covers=None,
+                              breakpoints=None)
+                     for one_test in test.tests]
+
+        test = MultiTest(name=test.name,
+                         make_ctx_call=None,
+                         destroy_ctx_call=None,
+                         tests=all_tests,
+                         atomic=test.atomic
+                         )

[dnj, 2014/09/12 17:35:37]

Maybe put a TypeError guard up in case someone creates another test type and
forgets to add it here. If you do this, make sure you pass 'FakeTest' instances
:)

[pgervais, 2014/09/12 21:28:31]

Done.

+
+      put_next_stage(test)