| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
|
| index 263f7acf8bca519bf98c81167312dd94f5b30d26..933f70ad26d09ba8576ffa3ca8c3c027bda4a90f 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
|
| @@ -25,7 +25,6 @@
|
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| -
|
| """
|
| This is an implementation of the Port interface that overrides other
|
| ports and changes the Driver binary to "MockDRT".
|
| @@ -85,11 +84,8 @@ class MockDRTPort(object):
|
| def _mocked_driver_maker(self, port, worker_number, pixel_tests, no_timeout=False):
|
| path_to_this_file = self.host.filesystem.abspath(__file__.replace('.pyc', '.py'))
|
| driver = self.__delegate_driver_class()(self, worker_number, pixel_tests, no_timeout)
|
| - driver.cmd_line = self._overriding_cmd_line(driver.cmd_line,
|
| - self.__delegate._path_to_driver(),
|
| - sys.executable,
|
| - path_to_this_file,
|
| - self.__delegate.name())
|
| + driver.cmd_line = self._overriding_cmd_line(driver.cmd_line, self.__delegate._path_to_driver(), sys.executable,
|
| + path_to_this_file, self.__delegate.name())
|
| return driver
|
|
|
| @staticmethod
|
| @@ -164,8 +160,8 @@ def parse_options(argv):
|
| return None
|
|
|
| options = optparse.Values({
|
| - 'actual_directory': get_arg('--actual-directory'),
|
| - 'platform': get_arg('--platform'),
|
| + 'actual_directory': get_arg('--actual-directory'),
|
| + 'platform': get_arg('--platform'),
|
| 'virtual_test_suite_base': get_arg('--virtual-test-suite-base'),
|
| 'virtual_test_suite_name': get_arg('--virtual-test-suite-name'),
|
| })
|
| @@ -224,7 +220,8 @@ class MockDRT(object):
|
| def output_for_test(self, test_input, is_reftest):
|
| port = self._port
|
| if self._options.virtual_test_suite_name:
|
| - test_input.test_name = test_input.test_name.replace(self._options.virtual_test_suite_base, self._options.virtual_test_suite_name)
|
| + test_input.test_name = test_input.test_name.replace(self._options.virtual_test_suite_base,
|
| + self._options.virtual_test_suite_name)
|
| actual_text = port.expected_text(test_input.test_name)
|
| actual_audio = port.expected_audio(test_input.test_name)
|
| actual_image = None
|
|
|