1 files changed, 37 insertions, 91 deletions
diff --git a/deps/v8/tools/testrunner/local/testsuite_unittest.py b/deps/v8/tools/testrunner/local/testsuite_unittest.py
index efefe4c533..efc9fdacf0 100755
--- a/deps/v8/tools/testrunner/local/testsuite_unittest.py
+++ b/deps/v8/tools/testrunner/local/testsuite_unittest.py
@@ -5,6 +5,7 @@
 
 import os
 import sys
+import tempfile
 import unittest
 
 # Needed because the test runner contains relative imports.
@@ -14,107 +15,52 @@ sys.path.append(TOOLS_PATH)
 
 from testrunner.local.testsuite import TestSuite
 from testrunner.objects.testcase import TestCase
+from testrunner.test_config import TestConfig
 
 
 class TestSuiteTest(unittest.TestCase):
-  def test_filter_testcases_by_status_first_pass(self):
-    suite = TestSuite('foo', 'bar')
-    suite.rules = {
-      '': {
-        'foo/bar': set(['PASS', 'SKIP']),
-        'baz/bar': set(['PASS', 'FAIL']),
-      },
-    }
-    suite.prefix_rules = {
-      '': {
-        'baz/': set(['PASS', 'SLOW']),
-      },
-    }
-    suite.tests = [
-      TestCase(suite, 'foo/bar', 'foo/bar'),
-      TestCase(suite, 'baz/bar', 'baz/bar'),
-    ]
-    suite.FilterTestCasesByStatus()
-    self.assertEquals(
-        [TestCase(suite, 'baz/bar', 'baz/bar')],
-        suite.tests,
+  def setUp(self):
+    test_dir = os.path.dirname(__file__)
+    self.test_root = os.path.join(test_dir, "fake_testsuite")
+    self.test_config = TestConfig(
+        command_prefix=[],
+        extra_flags=[],
+        isolates=False,
+        mode_flags=[],
+        no_harness=False,
+        noi18n=False,
+        random_seed=0,
+        run_skipped=False,
+        shell_dir='fake_testsuite/fake_d8',
+        timeout=10,
+        verbose=False,
     )
-    outcomes = suite.GetStatusFileOutcomes(suite.tests[0].name,
-                                           suite.tests[0].variant)
-    self.assertEquals(set(['PASS', 'FAIL', 'SLOW']), outcomes)
 
-  def test_filter_testcases_by_status_second_pass(self):
-    suite = TestSuite('foo', 'bar')
+    self.suite = TestSuite.Load(self.test_root, self.test_config)
 
-    suite.rules = {
-      '': {
-        'foo/bar': set(['PREV']),
-      },
-      'default': {
-        'foo/bar': set(['PASS', 'SKIP']),
-        'baz/bar': set(['PASS', 'FAIL']),
-      },
-      'stress': {
-        'baz/bar': set(['SKIP']),
-      },
-    }
-    suite.prefix_rules = {
-      '': {
-        'baz/': set(['PREV']),
-      },
-      'default': {
-        'baz/': set(['PASS', 'SLOW']),
-      },
-      'stress': {
-        'foo/': set(['PASS', 'SLOW']),
-      },
-    }
+  def testLoadingTestSuites(self):
+    self.assertEquals(self.suite.name, "fake_testsuite")
+    self.assertEquals(self.suite.test_config, self.test_config)
 
-    test1 = TestCase(suite, 'foo/bar', 'foo/bar')
-    test2 = TestCase(suite, 'baz/bar', 'baz/bar')
-    suite.tests = [
-      test1.create_variant(variant='default', flags=[]),
-      test1.create_variant(variant='stress', flags=['-v']),
-      test2.create_variant(variant='default', flags=[]),
-      test2.create_variant(variant='stress', flags=['-v']),
-    ]
+    # Verify that the components of the TestSuite aren't loaded yet.
+    self.assertIsNone(self.suite.tests)
+    self.assertIsNone(self.suite.statusfile)
 
-    suite.FilterTestCasesByStatus()
-    self.assertEquals(
-        [
-          TestCase(suite, 'foo/bar', 'foo/bar').create_variant(None, ['-v']),
-          TestCase(suite, 'baz/bar', 'baz/bar'),
-        ],
-        suite.tests,
-    )
-
-    self.assertEquals(
-        set(['PREV', 'PASS', 'SLOW']),
-        suite.GetStatusFileOutcomes(suite.tests[0].name,
-                                    suite.tests[0].variant),
-    )
-    self.assertEquals(
-        set(['PREV', 'PASS', 'FAIL', 'SLOW']),
-        suite.GetStatusFileOutcomes(suite.tests[1].name,
-                                    suite.tests[1].variant),
-    )
+  def testLoadingTestsFromDisk(self):
+    slow_tests, fast_tests = self.suite.load_tests_from_disk(
+      statusfile_variables={})
+    def is_generator(iterator):
+      return iterator == iter(iterator)
 
-  def test_fail_ok_outcome(self):
-    suite = TestSuite('foo', 'bar')
-    suite.rules = {
-      '': {
-        'foo/bar': set(['FAIL_OK']),
-        'baz/bar': set(['FAIL']),
-      },
-    }
-    suite.prefix_rules = {}
-    suite.tests = [
-      TestCase(suite, 'foo/bar', 'foo/bar'),
-      TestCase(suite, 'baz/bar', 'baz/bar'),
-    ]
+    self.assertTrue(is_generator(slow_tests))
+    self.assertTrue(is_generator(fast_tests))
 
-    for t in suite.tests:
-      self.assertEquals(['FAIL'], t.expected_outcomes)
+    slow_tests, fast_tests = list(slow_tests), list(fast_tests)
+    # Verify that the components of the TestSuite are loaded.
+    self.assertTrue(len(slow_tests) == len(fast_tests) == 1)
+    self.assertTrue(all(test.is_slow for test in slow_tests))
+    self.assertFalse(any(test.is_slow for test in fast_tests))
+    self.assertIsNotNone(self.suite.statusfile)
 
 
 if __name__ == '__main__':