[test] Code cleanup in testcfg.py

- All testcase/testsuite/variant generator subclasses renamed to
  just TestCase/TestSuite/VariantGenerator since they're private
  implementation.
- All `testcase` variables renamed to `test` to not conflict with
  a module name.
- No more two statements in the same line.
- Removed some unused testsuite methods.

Bug: v8:6917
Cq-Include-Trybots: master.tryserver.v8:v8_linux_noi18n_rel_ng
Change-Id: I7710f3419f738a5f9ddca73765dd2cad2e35b952
Reviewed-on: https://chromium-review.googlesource.com/823964Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michał Majewski <majeski@google.com>
Cr-Commit-Position: refs/heads/master@{#50076}

test/benchmarks/testcfg.py

@@ -31,10 +31,10 @@ import shutil
 
 from testrunner.local import statusfile
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 
-class BenchmarksVariantGenerator(testsuite.VariantGenerator):
+class VariantGenerator(testsuite.VariantGenerator):
   # Both --noopt and --stressopt are very slow. Add TF but without
   # always opt to match the way the benchmarks are run for performance
   # testing.
@@ -44,13 +44,13 @@ class BenchmarksVariantGenerator(testsuite.VariantGenerator):
       return self.standard_variant
     return self.fast_variants
 
-  def GetFlagSets(self, testcase, variant):
+  def GetFlagSets(self, test, variant):
     return testsuite.FAST_VARIANT_FLAGS[variant]
 
 
-class BenchmarksTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def __init__(self, name, root):
-    super(BenchmarksTestSuite, self).__init__(name, root)
+    super(TestSuite, self).__init__(name, root)
     self.testroot = os.path.join(root, "data")
 
   def ListTests(self, context):
@@ -116,13 +116,13 @@ class BenchmarksTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return BenchmarksTestCase
+    return TestCase
 
   def _VariantGeneratorFactory(self):
-    return BenchmarksVariantGenerator
+    return VariantGenerator
 
 
-class BenchmarksTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_files_params(self, ctx):
     path = self.path
     testroot = self.suite.testroot
@@ -151,4 +151,4 @@ class BenchmarksTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return BenchmarksTestSuite(name, root)
+  return TestSuite(name, root)

test/cctest/testcfg.py

@@ -31,12 +31,12 @@ import shutil
 from testrunner.local import command
 from testrunner.local import testsuite
 from testrunner.local import utils
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 SHELL = 'cctest'
 
 
-class CcTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     shell = os.path.abspath(os.path.join(context.shell_dir, SHELL))
     if utils.IsWindows():
@@ -56,10 +56,10 @@ class CcTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return CcTestCase
+    return TestCase
 
 
-class CcTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_shell(self):
     return SHELL
 
@@ -68,4 +68,4 @@ class CcTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return CcTestSuite(name, root)
+  return TestSuite(name, root)

test/debugger/testcfg.py

@@ -6,12 +6,12 @@ import os
 import re
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
 MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE)
 
-class DebuggerTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root):
@@ -29,12 +29,12 @@ class DebuggerTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return DebuggerTestCase
+    return TestCase
 
 
-class DebuggerTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(DebuggerTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_files = None
@@ -46,7 +46,7 @@ class DebuggerTestCase(TestCase):
     self._source_flags = self._parse_source_flags(source)
 
   def _copy(self):
-    copy = super(DebuggerTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_files = self._source_files
     copy._source_flags = self._source_flags
     return copy
@@ -90,4 +90,4 @@ class DebuggerTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return DebuggerTestSuite(name, root)
+  return TestSuite(name, root)

test/fuzzer/testcfg.py

@@ -5,10 +5,10 @@
 import os
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 
-class FuzzerVariantGenerator(testsuite.VariantGenerator):
+class VariantGenerator(testsuite.VariantGenerator):
   # Only run the fuzzer with standard variant.
   def FilterVariantsByTest(self, test):
     return self.standard_variant
@@ -17,7 +17,7 @@ class FuzzerVariantGenerator(testsuite.VariantGenerator):
     return testsuite.FAST_VARIANT_FLAGS[variant]
 
 
-class FuzzerTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   SUB_TESTS = ( 'json', 'parser', 'regexp', 'wasm', 'wasm_async',
           'wasm_call', 'wasm_code', 'wasm_compile', 'wasm_data_section',
           'wasm_function_sigs_section', 'wasm_globals_section',
@@ -26,7 +26,7 @@ class FuzzerTestSuite(testsuite.TestSuite):
 
   def ListTests(self, context):
     tests = []
-    for subtest in FuzzerTestSuite.SUB_TESTS:
+    for subtest in TestSuite.SUB_TESTS:
       for fname in os.listdir(os.path.join(self.root, subtest)):
         if not os.path.isfile(os.path.join(self.root, subtest, fname)):
           continue
@@ -36,13 +36,13 @@ class FuzzerTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return FuzzerTestCase
+    return TestCase
 
   def _VariantGeneratorFactory(self):
-    return FuzzerVariantGenerator
+    return VariantGenerator
 
 
-class FuzzerTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_files_params(self, ctx):
     suite, name = self.path.split('/')
     return [os.path.join(self.suite.root, suite, name)]
@@ -62,4 +62,4 @@ class FuzzerTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return FuzzerTestSuite(name, root)
+  return TestSuite(name, root)

test/inspector/testcfg.py

@@ -7,16 +7,17 @@ import os
 
 from testrunner.local import testsuite
 from testrunner.local import utils
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 PROTOCOL_TEST_JS = "protocol-test.js"
 EXPECTED_SUFFIX = "-expected.txt"
 RESOURCES_FOLDER = "resources"
 
-class InspectorProtocolTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
-    for dirname, dirs, files in os.walk(os.path.join(self.root), followlinks=True):
+    for dirname, dirs, files in os.walk(
+        os.path.join(self.root), followlinks=True):
       for dotted in [x for x in dirs if x.startswith('.')]:
         dirs.remove(dotted)
       if dirname.endswith(os.path.sep + RESOURCES_FOLDER):
@@ -33,11 +34,12 @@ class InspectorProtocolTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return InspectorTestCase
+    return TestCase
 
   def _IgnoreLine(self, string):
     """Ignore empty lines, valgrind output and Android output."""
-    if not string: return True
+    if not string:
+      return True
     return (string.startswith("==") or string.startswith("**") or
             string.startswith("ANDROID") or
             # FIXME(machenbach): The test driver shouldn't try to use slow
@@ -45,24 +47,26 @@ class InspectorProtocolTestSuite(testsuite.TestSuite):
             string == "Warning: unknown flag --enable-slow-asserts." or
             string == "Try --help for options")
 
-  def IsFailureOutput(self, testcase):
-    file_name = os.path.join(self.root, testcase.path) + EXPECTED_SUFFIX
+  def IsFailureOutput(self, test):
+    file_name = os.path.join(self.root, test.path) + EXPECTED_SUFFIX
     with file(file_name, "r") as expected:
       expected_lines = expected.readlines()
 
     def ExpIterator():
       for line in expected_lines:
-        if not line.strip(): continue
+        if not line.strip():
+          continue
         yield line.strip()
 
     def ActIterator(lines):
       for line in lines:
-        if self._IgnoreLine(line.strip()): continue
+        if self._IgnoreLine(line.strip()):
+          continue
         yield line.strip()
 
     def ActBlockIterator():
       """Iterates over blocks of actual output lines."""
-      lines = testcase.output.stdout.splitlines()
+      lines = test.output.stdout.splitlines()
       start_index = 0
       found_eqeq = False
       for index, line in enumerate(lines):
@@ -87,9 +91,9 @@ class InspectorProtocolTestSuite(testsuite.TestSuite):
       return False
 
 
-class InspectorTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(InspectorTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_flags = None
@@ -98,7 +102,7 @@ class InspectorTestCase(TestCase):
     self._source_flags = self._parse_source_flags()
 
   def _copy(self):
-    copy = super(InspectorTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_flags = self._source_flags
     return copy
 
@@ -119,4 +123,4 @@ class InspectorTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return InspectorProtocolTestSuite(name, root)
+  return TestSuite(name, root)

test/intl/testcfg.py

@@ -28,9 +28,9 @@
 import os
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
-class IntlTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root):
@@ -50,12 +50,12 @@ class IntlTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return IntlTestCase
+    return TestCase
 
 
-class IntlTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(IntlTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_flags = None
@@ -64,7 +64,7 @@ class IntlTestCase(TestCase):
     self._source_flags = self._parse_source_flags()
 
   def _copy(self):
-    copy = super(IntlTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_flags = self._source_flags
     return copy
 
@@ -92,4 +92,4 @@ class IntlTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return IntlTestSuite(name, root)
+  return TestSuite(name, root)

test/message/testcfg.py

@@ -31,14 +31,14 @@ import re
 
 from testrunner.local import testsuite
 from testrunner.local import utils
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 
 INVALID_FLAGS = ["--enable-slow-asserts"]
 MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE)
 
 
-class MessageTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root):
@@ -56,21 +56,24 @@ class MessageTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return MessageTestCase
+    return TestCase
 
   def CreateVariantGenerator(self, variants):
-    return super(MessageTestSuite, self).CreateVariantGenerator(
+    return super(TestSuite, self).CreateVariantGenerator(
         variants + ["preparser"])
 
   def _IgnoreLine(self, string):
     """Ignore empty lines, valgrind output, Android output."""
-    if not string: return True
-    if not string.strip(): return True
-    return (string.startswith("==") or string.startswith("**") or
-            string.startswith("ANDROID"))
-
-  def _GetExpectedFail(self, testcase):
-    path = testcase.path
+    return (
+      not string or
+      not string.strip() or
+      string.startswith("==") or
+      string.startswith("**") or
+      string.startswith("ANDROID")
+    )
+
+  def _GetExpectedFail(self, test):
+    path = test.path
     while path:
       (head, tail) = os.path.split(path)
       if tail == "fail":
@@ -78,11 +81,11 @@ class MessageTestSuite(testsuite.TestSuite):
       path = head
     return False
 
-  def IsFailureOutput(self, testcase):
-    output = testcase.output
-    testpath = testcase.path
-    expected_fail = self._GetExpectedFail(testcase)
-    fail = testcase.output.exit_code != 0
+  def IsFailureOutput(self, test):
+    output = test.output
+    testpath = test.path
+    expected_fail = self._GetExpectedFail(test)
+    fail = test.output.exit_code != 0
     if expected_fail != fail:
       return True
     expected_path = os.path.join(self.root, testpath + ".out")
@@ -90,7 +93,8 @@ class MessageTestSuite(testsuite.TestSuite):
     # Can't use utils.ReadLinesFrom() here because it strips whitespace.
     with open(expected_path) as f:
       for line in f:
-        if line.startswith("#") or not line.strip(): continue
+        if line.startswith("#") or not line.strip():
+          continue
         expected_lines.append(line)
     raw_lines = output.stdout.splitlines()
     actual_lines = [ s for s in raw_lines if not self._IgnoreLine(s) ]
@@ -107,13 +111,10 @@ class MessageTestSuite(testsuite.TestSuite):
         return True
     return False
 
-  def StripOutputForTransmit(self, testcase):
-    pass
-
 
-class MessageTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(MessageTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_files = None
@@ -125,7 +126,7 @@ class MessageTestCase(TestCase):
     self._source_flags = self._parse_source_flags(source)
 
   def _copy(self):
-    copy = super(MessageTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_files = self._source_files
     copy._source_flags = self._source_flags
     return copy
@@ -138,7 +139,7 @@ class MessageTestCase(TestCase):
     return files
 
   def _get_cmd_params(self, ctx):
-    params = super(MessageTestCase, self)._get_cmd_params(ctx)
+    params = super(TestCase, self)._get_cmd_params(ctx)
     return [p for p in params if p not in INVALID_FLAGS]
 
   def _get_files_params(self, ctx):
@@ -151,4 +152,4 @@ class MessageTestCase(TestCase):
     return os.path.join(self.suite.root, self.path + self._get_suffix())
 
 def GetSuite(name, root):
-  return MessageTestSuite(name, root)
+  return TestSuite(name, root)

test/mjsunit/testcfg.py

@@ -29,7 +29,7 @@ import os
 import re
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
 ENV_PATTERN = re.compile(r"//\s+Environment Variables:(.*)")
@@ -38,7 +38,7 @@ MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE)
 NO_HARNESS_PATTERN = re.compile(r"^// NO HARNESS$", flags=re.MULTILINE)
 
 
-class MjsunitTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root, followlinks=True):
@@ -56,12 +56,12 @@ class MjsunitTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return MjsunitTestCase
+    return TestCase
 
 
-class MjsunitTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(MjsunitTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_files = None
@@ -107,7 +107,7 @@ class MjsunitTestCase(TestCase):
     self._env = self._parse_source_env(source)
 
   def _copy(self):
-    copy = super(MjsunitTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_files = self._source_files
     copy._source_flags = self._source_flags
     copy._mjsunit_files = self._mjsunit_files
@@ -145,4 +145,4 @@ class MjsunitTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return MjsunitTestSuite(name, root)
+  return TestSuite(name, root)

test/mkgrokdump/testcfg.py

@@ -6,21 +6,21 @@ import os
 import difflib
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 
 SHELL = 'mkgrokdump'
 
-class MkGrokdump(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     test = self._create_test(SHELL)
     return [test]
 
   def _test_class(self):
-    return MkGrokTestCase
+    return TestCase
 
-  def IsFailureOutput(self, testcase):
-    output = testcase.output
+  def IsFailureOutput(self, test):
+    output = test.output
     v8_path = os.path.dirname(os.path.dirname(os.path.abspath(self.root)))
     expected_path = os.path.join(v8_path, "tools", "v8heapconst.py")
     with open(expected_path) as f:
@@ -41,7 +41,7 @@ class MkGrokdump(testsuite.TestSuite):
     return False
 
 
-class MkGrokTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_variant_flags(self):
     return []
 
@@ -56,4 +56,4 @@ class MkGrokTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return MkGrokdump(name, root)
+  return TestSuite(name, root)

test/mozilla/testcfg.py

@@ -29,7 +29,7 @@
 import os
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 EXCLUDED = ["CVS", ".svn"]
 
@@ -54,9 +54,9 @@ TEST_DIRS = """
 """.split()
 
 
-class MozillaTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def __init__(self, name, root):
-    super(MozillaTestSuite, self).__init__(name, root)
+    super(TestSuite, self).__init__(name, root)
     self.testroot = os.path.join(root, "data")
 
   def ListTests(self, context):
@@ -81,18 +81,18 @@ class MozillaTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return MozillaTestCase
+    return TestCase
 
-  def IsNegativeTest(self, testcase):
-    return testcase.path.endswith("-n")
+  def IsNegativeTest(self, test):
+    return test.path.endswith("-n")
 
-  def IsFailureOutput(self, testcase):
-    if testcase.output.exit_code != 0:
+  def IsFailureOutput(self, test):
+    if test.output.exit_code != 0:
       return True
-    return "FAILED!" in testcase.output.stdout
+    return "FAILED!" in test.output.stdout
 
 
-class MozillaTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_files_params(self, ctx):
     files = [os.path.join(self.suite.root, "mozilla-shell-emulation.js")]
     testfilename = self.path + ".js"
@@ -115,4 +115,4 @@ class MozillaTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return MozillaTestSuite(name, root)
+  return TestSuite(name, root)

test/preparser/testcfg.py

@@ -29,10 +29,10 @@
 import os
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 
-class PreparserTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def _ParsePythonTestTemplates(self, result, filename):
     pathname = os.path.join(self.root, filename + ".pyt")
     def Test(name, source, expectation):
@@ -66,19 +66,19 @@ class PreparserTestSuite(testsuite.TestSuite):
     return result
 
   def _create_test(self, path, source, template_flags):
-    return super(PreparserTestSuite, self)._create_test(
+    return super(TestSuite, self)._create_test(
         path, source=source, template_flags=template_flags)
 
   def _test_class(self):
-    return PreparserTestCase
+    return TestCase
 
   def _VariantGeneratorFactory(self):
     return testsuite.StandardVariantGenerator
 
 
-class PreparserTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, suite, path, name, source, template_flags):
-    super(PreparserTestCase, self).__init__(suite, path, name)
+    super(TestCase, self).__init__(suite, path, name)
     self._source = source
     self._template_flags = template_flags
 
@@ -109,4 +109,4 @@ class PreparserTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return PreparserTestSuite(name, root)
+  return TestSuite(name, root)

test/test262/testcfg.py

@@ -37,7 +37,7 @@ import tarfile
 from testrunner.local import statusfile
 from testrunner.local import testsuite
 from testrunner.local import utils
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 # TODO(littledan): move the flag mapping into the status file
 FEATURE_FLAGS = {
@@ -102,7 +102,7 @@ FAST_VARIANTS = {
   'both': FAST_VARIANT_FLAGS_BOTH,
 }
 
-class Test262VariantGenerator(testsuite.VariantGenerator):
+class VariantGenerator(testsuite.VariantGenerator):
   def GetFlagSets(self, test, variant):
     outcomes = test.suite.GetStatusFileOutcomes(test.name, test.variant)
     if outcomes and statusfile.OnlyFastVariants(outcomes):
@@ -118,12 +118,12 @@ class Test262VariantGenerator(testsuite.VariantGenerator):
     return variant_flags["both"][variant]
 
 
-class Test262TestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   # Match the (...) in '/path/to/v8/test/test262/subdir/test/(...).js'
   # In practice, subdir is data or local-tests
 
   def __init__(self, name, root):
-    super(Test262TestSuite, self).__init__(name, root)
+    super(TestSuite, self).__init__(name, root)
     self.testroot = os.path.join(self.root, *TEST_262_SUITE_PATH)
     self.harnesspath = os.path.join(self.root, *TEST_262_HARNESS_PATH)
     self.harness = [os.path.join(self.harnesspath, f)
@@ -188,29 +188,29 @@ class Test262TestSuite(testsuite.TestSuite):
                     case.test_record.get("features", []))) == 0]
 
   def _test_class(self):
-    return Test262TestCase
+    return TestCase
 
-  def IsFailureOutput(self, testcase):
-    output = testcase.output
-    test_record = testcase.test_record
+  def IsFailureOutput(self, test):
+    output = test.output
+    test_record = test.test_record
     if output.exit_code != 0:
       return True
     if ("negative" in test_record and
         "type" in test_record["negative"] and
-        self._ParseException(output.stdout, testcase) !=
+        self._ParseException(output.stdout, test) !=
             test_record["negative"]["type"]):
         return True
     return "FAILED!" in output.stdout
 
-  def _ParseException(self, str, testcase):
+  def _ParseException(self, string, test):
     # somefile:somelinenumber: someerror[: sometext]
     # somefile might include an optional drive letter on windows e.g. "e:".
     match = re.search(
-        '^(?:\w:)?[^:]*:[0-9]+: ([^: ]+?)($|: )', str, re.MULTILINE)
+        '^(?:\w:)?[^:]*:[0-9]+: ([^: ]+?)($|: )', string, re.MULTILINE)
     if match:
       return match.group(1).strip()
     else:
-      print "Error parsing exception for %s" % testcase
+      print "Error parsing exception for %s" % test
       return None
 
   def GetExpectedOutcomes(self, test):
@@ -218,15 +218,15 @@ class Test262TestSuite(testsuite.TestSuite):
     if (statusfile.FAIL_SLOPPY in outcomes and
         '--use-strict' not in test.cmd.args):
       return [statusfile.FAIL]
-    return super(Test262TestSuite, self).GetExpectedOutcomes(test)
+    return super(TestSuite, self).GetExpectedOutcomes(test)
 
   def _VariantGeneratorFactory(self):
-    return Test262VariantGenerator
+    return VariantGenerator
 
 
-class Test262TestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(Test262TestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self.test_record = None
@@ -236,7 +236,7 @@ class Test262TestCase(TestCase):
     self.test_record = self.suite.parse_test_record(source, self.path)
 
   def _copy(self):
-    copy = super(Test262TestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy.test_record = self.test_record
     return copy
 
@@ -279,4 +279,4 @@ class Test262TestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return Test262TestSuite(name, root)
+  return TestSuite(name, root)

test/unittests/testcfg.py

@@ -6,11 +6,11 @@ import os
 
 from testrunner.local import command
 from testrunner.local import utils
-from testrunner.local.testsuite import TestSuite, StandardVariantGenerator
-from testrunner.objects.testcase import TestCase
+from testrunner.local import testsuite
+from testrunner.objects import testcase
 
 
-class GoogleTestSuite(TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     shell = os.path.abspath(os.path.join(context.shell_dir, self.name))
     if utils.IsWindows():
@@ -48,13 +48,13 @@ class GoogleTestSuite(TestSuite):
     return tests
 
   def _test_class(self):
-    return GoogleTestCase
+    return TestCase
 
   def _VariantGeneratorFactory(self):
-    return StandardVariantGenerator
+    return testsuite.StandardVariantGenerator
 
 
-class GoogleTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_suite_flags(self, ctx):
     return (
         ["--gtest_filter=" + self.path] +
@@ -67,4 +67,4 @@ class GoogleTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return GoogleTestSuite(name, root)
+  return TestSuite(name, root)

test/wasm-spec-tests/testcfg.py

@@ -5,9 +5,9 @@
 import os
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
-class WasmSpecTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root):
@@ -23,13 +23,13 @@ class WasmSpecTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return WasmSpecTestCase
+    return TestCase
 
 
-class WasmSpecTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def _get_files_params(self, ctx):
     return [os.path.join(self.suite.root, self.path + self._get_suffix())]
 
 
 def GetSuite(name, root):
-  return WasmSpecTestSuite(name, root)
+  return TestSuite(name, root)

test/webkit/testcfg.py

@@ -30,14 +30,14 @@ import os
 import re
 
 from testrunner.local import testsuite
-from testrunner.objects.testcase import TestCase
+from testrunner.objects import testcase
 
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
 SELF_SCRIPT_PATTERN = re.compile(r"//\s+Env: TEST_FILE_NAME")
 
 
 # TODO (machenbach): Share commonalities with mjstest.
-class WebkitTestSuite(testsuite.TestSuite):
+class TestSuite(testsuite.TestSuite):
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.root):
@@ -58,13 +58,14 @@ class WebkitTestSuite(testsuite.TestSuite):
     return tests
 
   def _test_class(self):
-    return WebkitTestCase
+    return TestCase
 
   # TODO(machenbach): Share with test/message/testcfg.py
   def _IgnoreLine(self, string):
     """Ignore empty lines, valgrind output, Android output and trace
     incremental marking output."""
-    if not string: return True
+    if not string:
+      return True
     return (string.startswith("==") or string.startswith("**") or
             string.startswith("ANDROID") or "[IncrementalMarking]" in string or
             # FIXME(machenbach): The test driver shouldn't try to use slow
@@ -72,26 +73,28 @@ class WebkitTestSuite(testsuite.TestSuite):
             string == "Warning: unknown flag --enable-slow-asserts." or
             string == "Try --help for options")
 
-  def IsFailureOutput(self, testcase):
-    if super(WebkitTestSuite, self).IsFailureOutput(testcase):
+  def IsFailureOutput(self, test):
+    if super(TestSuite, self).IsFailureOutput(test):
       return True
-    file_name = os.path.join(self.root, testcase.path) + "-expected.txt"
+    file_name = os.path.join(self.root, test.path) + "-expected.txt"
     with file(file_name, "r") as expected:
       expected_lines = expected.readlines()
 
     def ExpIterator():
       for line in expected_lines:
-        if line.startswith("#") or not line.strip(): continue
+        if line.startswith("#") or not line.strip():
+          continue
         yield line.strip()
 
     def ActIterator(lines):
       for line in lines:
-        if self._IgnoreLine(line.strip()): continue
+        if self._IgnoreLine(line.strip()):
+          continue
         yield line.strip()
 
     def ActBlockIterator():
       """Iterates over blocks of actual output lines."""
-      lines = testcase.output.stdout.splitlines()
+      lines = test.output.stdout.splitlines()
       start_index = 0
       found_eqeq = False
       for index, line in enumerate(lines):
@@ -116,9 +119,9 @@ class WebkitTestSuite(testsuite.TestSuite):
       return False
 
 
-class WebkitTestCase(TestCase):
+class TestCase(testcase.TestCase):
   def __init__(self, *args, **kwargs):
-    super(WebkitTestCase, self).__init__(*args, **kwargs)
+    super(TestCase, self).__init__(*args, **kwargs)
 
     # precomputed
     self._source_files = None
@@ -130,7 +133,7 @@ class WebkitTestCase(TestCase):
     self._source_flags = self._parse_source_flags(source)
 
   def _copy(self):
-    copy = super(WebkitTestCase, self)._copy()
+    copy = super(TestCase, self)._copy()
     copy._source_files = self._source_files
     copy._source_flags = self._source_flags
     return copy
@@ -170,4 +173,4 @@ class WebkitTestCase(TestCase):
 
 
 def GetSuite(name, root):
-  return WebkitTestSuite(name, root)
+  return TestSuite(name, root)

tools/testrunner/local/testsuite.py

@@ -90,9 +90,6 @@ class TestSuite(object):
 
     self._outcomes_cache = dict()
 
-  def suffix(self):
-    return ".js"
-
   def status_file(self):
     return "%s/%s.status" % (self.root, self.name)
 
@@ -311,17 +308,6 @@ class TestSuite(object):
     return (self.GetOutcome(testcase, ctx)
             not in self.GetExpectedOutcomes(testcase))
 
-  def StripOutputForTransmit(self, testcase):
-    if not self.HasUnexpectedOutput(testcase):
-      testcase.output.stdout = ""
-      testcase.output.stderr = ""
-
-  def CalculateTotalDuration(self):
-    self.total_duration = 0.0
-    for t in self.tests:
-      self.total_duration += t.duration
-    return self.total_duration
-
   def _create_test(self, path, **kwargs):
     test = self._test_class()(self, path, self._path_to_name(path), **kwargs)
     test.precompute()

tools/testrunner/objects/testcase.py

@@ -32,6 +32,8 @@ import shlex
 from ..local import command
 from ..local import utils
 
+FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
+
 
 class TestCase(object):
   def __init__(self, suite, path, name):
@@ -172,13 +174,9 @@ class TestCase(object):
     )
 
   def _parse_source_flags(self, source=None):
-    PATTERN = re.compile(r"//\s+Flags:(.*)")
-
-    if not source:
-      source = self.get_source()
-
+    source = source or self.get_source()
     flags = []
-    for match in re.findall(PATTERN, source):
+    for match in re.findall(FLAGS_PATTERN, source):
       flags += shlex.split(match.strip())
     return flags