third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py - Issue 1624373005: Remove XP port from Blink LayoutTest related scripts.

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

Issue 1624373005: Remove XP port from Blink LayoutTest related scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync to head. Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8fb37fb2c815456b10c4bc9d3c82fd6968509a7c..12703303803b21da85a9de98a5c31dca582b4d3e 100644

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

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

@@ -36,7 +36,7 @@ from webkitpy.tool.mocktool import MockTool, MockOptions

class PrintExpectationsTest(unittest.TestCase):

- def run_test(self, tests, expected_stdout, platform='test-win-xp', **args):

+ def run_test(self, tests, expected_stdout, platform='test-win-win7', **args):

options = MockOptions(all=False, csv=False, full=False, platform=platform,

include_keyword=[], exclude_keyword=[], paths=False).update(**args)

tool = MockTool()

@@ -54,58 +54,58 @@ class PrintExpectationsTest(unittest.TestCase):

def test_basic(self):

self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],

- ('// For test-win-xp\n'

+ ('// For test-win-win7\n'

'failures/expected/text.html [ Failure ]\n'

'failures/expected/timeout.html [ Timeout ]\n'))

def test_multiple(self):

self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],

- ('// For test-win-win7\n'

+ ('// For test-win-win10\n'

'failures/expected/text.html [ Failure ]\n'

'failures/expected/timeout.html [ Timeout ]\n'

'\n'

- '// For test-win-xp\n'

+ '// For test-win-win7\n'

'failures/expected/text.html [ Failure ]\n'

'failures/expected/timeout.html [ Timeout ]\n'),

platform='test-win-*')

def test_full(self):

self.run_test(['failures/expected/text.html', 'failures/expected/timeout.html'],

- ('// For test-win-xp\n'

+ ('// For test-win-win7\n'

'Bug(test) failures/expected/text.html [ Failure ]\n'

'Bug(test) failures/expected/timeout.html [ Timeout ]\n'),

full=True)

def test_exclude(self):

self.run_test(['failures/expected/text.html', 'failures/expected/crash.html'],

- ('// For test-win-xp\n'

+ ('// For test-win-win7\n'

'failures/expected/text.html [ Failure ]\n'),

exclude_keyword=['crash'])

def test_include(self):

self.run_test(['failures/expected/text.html', 'failures/expected/crash.html'],

- ('// For test-win-xp\n'

+ ('// For test-win-win7\n'

'failures/expected/crash.html\n'),

include_keyword=['crash'])

def test_csv(self):

self.run_test(['failures/expected/text.html', 'failures/expected/image.html'],

- ('test-win-xp,failures/expected/image.html,Bug(test),,FAIL\n'

- 'test-win-xp,failures/expected/text.html,Bug(test),,FAIL\n'),

+ ('test-win-win7,failures/expected/image.html,Bug(test),,FAIL\n'

+ 'test-win-win7,failures/expected/text.html,Bug(test),,FAIL\n'),

csv=True)

def test_paths(self):

self.run_test([],

('/mock-checkout/LayoutTests/TestExpectations\n'

'LayoutTests/platform/test/TestExpectations\n'

- 'LayoutTests/platform/test-win-xp/TestExpectations\n'),

+ 'LayoutTests/platform/test-win-win7/TestExpectations\n'),

paths=True)

class PrintBaselinesTest(unittest.TestCase):

def setUp(self):

self.oc = None

self.tool = MockTool()

- self.test_port = self.tool.port_factory.get('test-win-xp')

+ self.test_port = self.tool.port_factory.get('test-win-win7')

self.tool.port_factory.get = lambda port_name=None: self.test_port

self.tool.port_factory.all_port_names = lambda: TestPort.ALL_BASELINE_VARIANTS

@@ -129,7 +129,7 @@ class PrintBaselinesTest(unittest.TestCase):

command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform=None), ['passes/text.html'], self.tool)

stdout, _, _ = self.restore_output()

self.assertMultiLineEqual(stdout,

- ('// For test-win-xp\n'

+ ('// For test-win-win7\n'

'passes/text-expected.png\n'

'passes/text-expected.txt\n'))

@@ -140,11 +140,11 @@ class PrintBaselinesTest(unittest.TestCase):

command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform='test-win-*'), ['passes/text.html'], self.tool)

stdout, _, _ = self.restore_output()

self.assertMultiLineEqual(stdout,

- ('// For test-win-win7\n'

+ ('// For test-win-win10\n'

'passes/text-expected.png\n'

'passes/text-expected.txt\n'

'\n'

- '// For test-win-xp\n'

+ '// For test-win-win7\n'

'passes/text-expected.png\n'

'passes/text-expected.txt\n'))

@@ -152,8 +152,8 @@ class PrintBaselinesTest(unittest.TestCase):

command = PrintBaselines()

command.bind_to_tool(self.tool)

self.capture_output()

- command.execute(MockOptions(all=False, platform='*xp', csv=True, include_virtual_tests=False), ['passes/text.html'], self.tool)

+ command.execute(MockOptions(all=False, platform='*win7', csv=True, include_virtual_tests=False), ['passes/text.html'], self.tool)

stdout, _, _ = self.restore_output()

self.assertMultiLineEqual(stdout,

- ('test-win-xp,passes/text.html,None,png,passes/text-expected.png,None\n'

- 'test-win-xp,passes/text.html,None,txt,passes/text-expected.txt,None\n'))

+ ('test-win-win7,passes/text.html,None,png,passes/text-expected.png,None\n'

+ 'test-win-win7,passes/text.html,None,txt,passes/text-expected.txt,None\n'))