third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py - Issue 2164153002: Reland of refactor the buildbot module in webkitpy.

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

Issue 2164153002: Reland of refactor the buildbot module in webkitpy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add latest_layout_test_results to BuildBot and use it in build_data(). Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py ('K') | « third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

index 704fc4616222a5d97ce12535edc27fd696a2d1d4..e041ce3f13c713e739fcff8d0663950785b2f043 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

@@ -4,7 +4,6 @@

import unittest

-from webkitpy.common.net.buildbot_mock import MockBuilder

from webkitpy.common.net.layouttestresults import LayoutTestResults

from webkitpy.common.system.executive_mock import MockExecutive

from webkitpy.common.system.executive_mock import MockExecutive2

@@ -16,7 +15,7 @@ from webkitpy.tool.mock_tool import MockTool, MockOptions

class BaseTestCase(unittest.TestCase):

MOCK_WEB_RESULT = 'MOCK Web result, convert 404 to None=True'

- WEB_PREFIX = 'http://example.com/f/builders/MOCK Mac10.11/results/layout-test-results'

+ WEB_PREFIX = 'https://storage.googleapis.com/chromium-layout-test-archives/MOCK_Mac10_11/results/layout-test-results'

command_constructor = None

@@ -254,6 +253,7 @@ Bug(A) [ Debug ] : fast/css/large-list-of-rules-crash.html [ Failure ]

self.options.suffixes = "png,wav,txt"

self.command._rebaseline_test_and_update_expectations(self.options)

+ self.maxDiff = None

self.assertItemsEqual(self.tool.web.urls_fetched,

[self.WEB_PREFIX + '/userscripts/another-test-actual.png',

self.WEB_PREFIX + '/userscripts/another-test-actual.wav',

@@ -530,7 +530,7 @@ class TestRebaseline(BaseTestCase):

command_constructor = Rebaseline # AKA webkit-patch rebaseline

def test_rebaseline(self):

- self.command._builders_to_pull_from = lambda: [MockBuilder('MOCK Win7')]

+ self.command._builders_to_pull_from = lambda: ['MOCK Win7']

self._write("userscripts/first-test.html", "test data")

@@ -545,7 +545,7 @@ class TestRebaseline(BaseTestCase):

[['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png', '--builder', 'MOCK Win7', '--test', 'userscripts/first-test.html', '--verbose']]])

def test_rebaseline_directory(self):

- self.command._builders_to_pull_from = lambda: [MockBuilder('MOCK Win7')]

+ self.command._builders_to_pull_from = lambda: ['MOCK Win7']

self._write("userscripts/first-test.html", "test data")

self._write("userscripts/second-test.html", "test data")

@@ -1437,3 +1437,9 @@ Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]

def test_execute_with_dry_run(self):

self._basic_execute_test([], dry_run=True)

self.assertEqual(self.tool.scm().local_commits(), [])

+ def test_bot_revision_data(self):

+ self._setup_mock_build_data()

+ self.assertEqual(

+ self.command.bot_revision_data(self.tool.scm()),

+ [{'builder': 'MOCK Win7', 'revision': '9000'}])

qyearsley 2016/07/20 22:37:49 Adding a test method to add some test coverage --