[blinkpy] Add some stylistic changes to blinkpy

This CL will remove the property decorator from a couple of fields in
the TestFailure class, add named parameters to the DriverOutput constructor
in test_failures_unittest.py and changed parameter names for baseline output
back to expected_driver_output.

Bug: chromium:1014196
Change-Id: I54353c2a6c19588b116a9f2ad86dc17df89f0f91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863572
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706173}

third_party/blink/tools/blinkpy/web_tests/controllers/single_test_runner.py

@@ -137,8 +137,8 @@ class SingleTestRunner(object):
     def _run_compare_test(self):
         """Runs the signle test and returns test result."""
         driver_output = self._driver.run_test(self._driver_input())
-        baseline_output = self._expected_driver_output()
-        failures = self._compare_output(baseline_output, driver_output)
+        expected_driver_output = self._expected_driver_output()
+        failures = self._compare_output(expected_driver_output, driver_output)
 
         return build_test_result(
             driver_output, self._test_name, retry_attempt=self._retry_attempt,
@@ -151,10 +151,10 @@ class SingleTestRunner(object):
         --copy-baselines are specified in the command line. If --reset-results,
         in the returned result we treat baseline mismatch as success."""
         driver_output = self._driver.run_test(self._driver_input())
-        baseline_output = self._expected_driver_output()
+        expected_driver_output = self._expected_driver_output()
 
         all_failures = self._compare_output(
-            baseline_output, driver_output)
+            expected_driver_output, driver_output)
 
         if self._options.reset_results:
             # Only report leaks, timeouts and crashes and treat all other

third_party/blink/tools/blinkpy/web_tests/models/test_failures.py

@@ -181,21 +181,13 @@ class TestFailure(object):
     def __init__(self, actual_driver_output, expected_driver_output):
         self.actual_driver_output = actual_driver_output
         self.expected_driver_output = expected_driver_output
-        self._has_stderr = False
-        self._repaint_overlay = False
+        self.has_stderr = False
+        self.has_repaint_overlay = False
         self.is_reftest = False
         if actual_driver_output:
-            self._has_stderr = actual_driver_output.has_stderr()
+            self.has_stderr = actual_driver_output.has_stderr()
         if expected_driver_output:
-            self._has_stderr |= expected_driver_output.has_stderr()
-
-    @property
-    def has_stderr(self):
-        return self._has_stderr
-
-    @property
-    def has_repaint_overlay(self):
-        return self._repaint_overlay
+            self.has_stderr |= expected_driver_output.has_stderr()
 
     def _write_to_artifacts(
             self, typ_artifacts, artifact_name, path, content, force_overwrite):
@@ -357,7 +349,7 @@ class FailureText(ActualAndBaselineArtifacts):
     def __init__(self, actual_driver_output, expected_driver_output):
         super(FailureText, self).__init__(
             actual_driver_output, expected_driver_output)
-        self._repaint_overlay = (
+        self.has_repaint_overlay = (
             repaint_overlay.result_contains_repaint_rects(
                 actual_driver_output.text) or
             repaint_overlay.result_contains_repaint_rects(

third_party/blink/tools/blinkpy/web_tests/models/test_failures_unittest.py

@@ -38,8 +38,8 @@ from blinkpy.web_tests.models.test_failures import (
 class TestFailuresTest(unittest.TestCase):
 
     def setUp(self):
-        self._actual_output = DriverOutput(None, None, None, None)
-        self._expected_output = DriverOutput(None, None, None, None)
+        self._actual_output = DriverOutput(text=None, image=None, image_hash=None, audio=None)
+        self._expected_output = DriverOutput(text=None, image=None, image_hash=None, audio=None)
 
     def assert_loads(self, cls):
         failure_obj = cls(self._actual_output, self._expected_output)