[test] Prepare new API for statusfile parsing.

First step in moving all statusfile logic into statusfile.py.

Introduce StatusFile object that will be used for storing and managing
outcomes.

Bug: v8:6917
Change-Id: I024f9b1d029830345149422a08a8905e92545252
Reviewed-on: https://chromium-review.googlesource.com/832433
Commit-Queue: Michał Majewski <majeski@google.com>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50202}

tools/testrunner/local/statusfile.py

@@ -67,6 +67,15 @@ for var in ["debug", "release", "big", "little",
 for var in ALL_VARIANTS:
   VARIABLES[var] = var
 
+class StatusFile(object):
+  def __init__(self, path, variables):
+    """
+    rules:        {variant: {test name: [rule]}}
+    prefix_rules: {variant: {test name prefix: [rule]}}
+    """
+    with open(path) as f:
+      self.rules, self.prefix_rules = ReadStatusFile(f.read(), variables)
+
 
 def _JoinsPassAndFail(outcomes1, outcomes2):
   """Indicates if we join PASS and FAIL from two different outcome sets and

tools/testrunner/local/testsuite.py

@@ -80,8 +80,7 @@ class TestSuite(object):
     self.name = name  # string
     self.root = root  # string containing path
     self.tests = None  # list of TestCase objects
-    self.rules = None  # {variant: {test name: [rule]}}
-    self.prefix_rules = None  # {variant: {test name prefix: [rule]}}
+    self.statusfile = None
 
   def status_file(self):
     return "%s/%s.status" % (self.root, self.name)
@@ -104,9 +103,7 @@ class TestSuite(object):
     return self._VariantGeneratorFactory()(self, set(variants))
 
   def ReadStatusFile(self, variables):
-    with open(self.status_file()) as f:
-      self.rules, self.prefix_rules = (
-          statusfile.ReadStatusFile(f.read(), variables))
+    self.statusfile = statusfile.StatusFile(self.status_file(), variables)
 
   def ReadTestCases(self, context):
     self.tests = self.ListTests(context)
@@ -167,20 +164,21 @@ class TestSuite(object):
     for test in self.tests:
       variant = test.variant or ""
 
-      if test.name in self.rules.get(variant, {}):
+      if test.name in self.statusfile.rules.get(variant, {}):
         used_rules.add((test.name, variant))
-        if statusfile.SKIP in self.rules[variant][test.name]:
+        if statusfile.SKIP in self.statusfile.rules[variant][test.name]:
           continue
 
-      for prefix in self.prefix_rules.get(variant, {}):
+      for prefix in self.statusfile.prefix_rules.get(variant, {}):
         if test.name.startswith(prefix):
           used_rules.add((prefix, variant))
-          if statusfile.SKIP in self.prefix_rules[variant][prefix]:
+          if statusfile.SKIP in self.statusfile.prefix_rules[variant][prefix]:
             break
 
     for variant in variants:
-      for rule, value in (list(self.rules.get(variant, {}).iteritems()) +
-                          list(self.prefix_rules.get(variant, {}).iteritems())):
+      for rule, value in (
+          list(self.statusfile.rules.get(variant, {}).iteritems()) +
+          list(self.statusfile.prefix_rules.get(variant, {}).iteritems())):
         if (rule, variant) not in used_rules:
           if variant == '':
             variant_desc = 'variant independent'
@@ -223,14 +221,13 @@ class TestSuite(object):
     variant = variant or ''
 
     # Load statusfile to get outcomes for the first time.
-    assert(self.rules is not None)
-    assert(self.prefix_rules is not None)
+    assert(self.statusfile is not None)
 
     outcomes = frozenset()
 
     for key in set([variant, '']):
-      rules = self.rules.get(key, {})
-      prefix_rules = self.prefix_rules.get(key, {})
+      rules = self.statusfile.rules.get(key, {})
+      prefix_rules = self.statusfile.prefix_rules.get(key, {})
 
       if testname in rules:
         outcomes |= rules[testname]