Index: build/android/pylib/utils/flakiness_dashboard_results_uploader.py |
diff --git a/build/android/pylib/utils/flakiness_dashboard_results_uploader.py b/build/android/pylib/utils/flakiness_dashboard_results_uploader.py |
index c7adc5989600f4226bb031f3fdd4bcd888f620e3..ac2b57603440c52a9bb26ecd9a90f4ea5bc1501f 100644 |
--- a/build/android/pylib/utils/flakiness_dashboard_results_uploader.py |
+++ b/build/android/pylib/utils/flakiness_dashboard_results_uploader.py |
@@ -13,48 +13,21 @@ import tempfile |
import xml |
-# Include path when ran from a Chromium checkout. |
-sys.path.append( |
- os.path.abspath(os.path.join(os.path.dirname(__file__), |
- os.pardir, os.pardir, os.pardir, os.pardir, |
- 'third_party', 'WebKit', 'Tools', 'Scripts'))) |
- |
-# Include path when ran from a WebKit checkout. |
-sys.path.append( |
- os.path.abspath(os.path.join(os.path.dirname(__file__), |
- os.pardir, os.pardir, os.pardir, os.pardir, |
- os.pardir, os.pardir, os.pardir, |
- 'Tools', 'Scripts'))) |
- |
-# pylint: disable=F0401 |
-from webkitpy.common.system import executive, filesystem |
-from webkitpy.layout_tests.layout_package import json_results_generator |
-# pylint: enable=F0401 |
- |
#TODO(craigdh): pylib/utils/ should not depend on pylib/. |
from pylib import cmd_helper |
from pylib import constants |
+from pylib.utils import json_results_generator |
from pylib.utils import repo_utils |
-# The JSONResultsGenerator gets the filesystem.join operation from the Port |
-# object. Creating a Port object requires specifying information that only |
-# makes sense for running WebKit layout tests, so we provide a dummy object |
-# that contains the fields required by the generator. |
-class PortDummy(object): |
- def __init__(self): |
- self._executive = executive.Executive() |
- self._filesystem = filesystem.FileSystem() |
- |
class JSONResultsGenerator(json_results_generator.JSONResultsGeneratorBase): |
"""Writes test results to a JSON file and handles uploading that file to |
the test results server. |
""" |
- def __init__(self, port, builder_name, build_name, build_number, tmp_folder, |
+ def __init__(self, builder_name, build_name, build_number, tmp_folder, |
test_results_map, test_results_server, test_type, master_name): |
super(JSONResultsGenerator, self).__init__( |
- port=port, |
builder_name=builder_name, |
build_name=build_name, |
build_number=build_number, |
@@ -175,7 +148,6 @@ class ResultsUploader(object): |
try: |
results_generator = JSONResultsGenerator( |
- port=PortDummy(), |
builder_name=self._builder_name, |
build_name=self._build_name, |
build_number=self._build_number, |