Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1469)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2456073002: Rename test port baseline directories in unit tests. (Closed)
Patch Set: Whitespace / comments Created 4 years, 2 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/layout_tests/port/test.py ('K') | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 7ee66f20df1d14000505fb6995fe95588934edc4..43af0dff74cc811d0970dcb9f00b53243ea51263 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
@@ -123,12 +123,12 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self._write(
port.host.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-mac-mac10.11/failures/expected/image-expected.txt'),
+ 'platform/mac-baselines/failures/expected/image-expected.txt'),
'original mac10.11 result')
self.assertFalse(self.tool.filesystem.exists(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-mac-mac10.10/failures/expected/image-expected.txt')))
+ 'platform/mac10.10-baselines/failures/expected/image-expected.txt')))
self.command.execute(self.options(builder='MOCK Mac10.11', test='failures/expected/image.html'), [], self.tool)
@@ -141,28 +141,28 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-mac-mac10.11/failures/expected/image-expected.txt')),
+ 'platform/mac-baselines/failures/expected/image-expected.txt')),
'original mac10.11 result')
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-mac-mac10.10/failures/expected/image-expected.txt')),
+ 'platform/mac10.10-baselines/failures/expected/image-expected.txt')),
'original mac10.11 result')
def test_copying_overwritten_baseline_to_multiple_locations(self):
self.tool.executive = MockExecutive2()
- def test_copy_baseline_win7_to_linux_trusty(self):
+ def test_copy_baseline_win_to_linux(self):
port = self.tool.port_factory.get('test-win-win7')
self._write(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win7/failures/expected/image-expected.txt'),
+ 'platform/win7-baselines/failures/expected/image-expected.txt'),
'original win7 result')
self.assertFalse(self.tool.filesystem.exists(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-linux-trusty/failures/expected/image-expected.txt')))
+ 'platform/linux-baselines/failures/expected/image-expected.txt')))
self.command.execute(self.options(builder='MOCK Win7', test='failures/expected/image.html'), [], self.tool)
@@ -171,12 +171,12 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win7/failures/expected/image-expected.txt')),
+ 'platform/win7-baselines/failures/expected/image-expected.txt')),
'original win7 result')
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-linux-trusty/failures/expected/image-expected.txt')),
+ 'platform/linux-baselines/failures/expected/image-expected.txt')),
'original win7 result')
def test_no_copy_existing_baseline(self):
@@ -184,12 +184,12 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self._write(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win7/failures/expected/image-expected.txt'),
+ 'platform/win7-baselines/failures/expected/image-expected.txt'),
'original win7 result')
self._write(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-linux-trusty/failures/expected/image-expected.txt'),
+ 'platform/linux-baselines/failures/expected/image-expected.txt'),
'original linux trusty result')
self.command.execute(self.options(builder='MOCK Win7', test='failures/expected/image.html'), [], self.tool)
@@ -198,12 +198,12 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win7/failures/expected/image-expected.txt')),
+ 'platform/win7-baselines/failures/expected/image-expected.txt')),
'original win7 result')
self.assertEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-linux-trusty/failures/expected/image-expected.txt')),
+ 'platform/linux-baselines/failures/expected/image-expected.txt')),
'original linux trusty result')
def test_no_copy_skipped_test(self):
@@ -211,7 +211,7 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self._write(
self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win7/failures/expected/image-expected.txt'),
+ 'platform/win7-baselines/failures/expected/image-expected.txt'),
'original win7 result')
self._write(
port.path_to_generic_test_expectations_file(),
@@ -225,7 +225,7 @@ class TestCopyExistingBaselinesInternal(BaseTestCase):
self.assertFalse(
self.tool.filesystem.exists(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-linux-trusty/failures/expected/image-expected.txt')))
+ 'platform/linux-baselines/failures/expected/image-expected.txt')))
class TestRebaselineTest(BaseTestCase):
@@ -247,13 +247,13 @@ class TestRebaselineTest(BaseTestCase):
def test_baseline_directory(self):
command = self.command
self.assertMultiLineEqual(command._baseline_directory("MOCK Mac10.11"),
- "/test.checkout/LayoutTests/platform/test-mac-mac10.11")
+ "/test.checkout/LayoutTests/platform/mac-baselines")
self.assertMultiLineEqual(command._baseline_directory("MOCK Mac10.10"),
- "/test.checkout/LayoutTests/platform/test-mac-mac10.10")
+ "/test.checkout/LayoutTests/platform/mac10.10-baselines")
self.assertMultiLineEqual(command._baseline_directory("MOCK Trusty"),
- "/test.checkout/LayoutTests/platform/test-linux-trusty")
+ "/test.checkout/LayoutTests/platform/linux-baselines")
self.assertMultiLineEqual(command._baseline_directory("MOCK Precise"),
- "/test.checkout/LayoutTests/platform/test-linux-precise")
+ "/test.checkout/LayoutTests/platform/linux-precise-baselines")
def test_rebaseline_updates_expectations_file_noop(self):
self._zero_out_test_expectations()
@@ -305,7 +305,7 @@ class TestRebaselineTest(BaseTestCase):
self._write(
port.host.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win10/failures/expected/image-expected.txt'),
+ 'platform/win-baselines/failures/expected/image-expected.txt'),
'original win10 result')
oc = OutputCapture()
@@ -327,10 +327,10 @@ class TestRebaselineTest(BaseTestCase):
self.assertMultiLineEqual(
self._read(self.tool.filesystem.join(
port.layout_tests_dir(),
- 'platform/test-win-win10/failures/expected/image-expected.txt')),
+ 'platform/win-baselines/failures/expected/image-expected.txt')),
'MOCK Web result, convert 404 to None=True')
self.assertFalse(self.tool.filesystem.exists(self.tool.filesystem.join(
- port.layout_tests_dir(), 'platform/test-win-win7/failures/expected/image-expected.txt')))
+ port.layout_tests_dir(), 'platform/win7-baselines/failures/expected/image-expected.txt')))
self.assertMultiLineEqual(
out, '{"remove-lines": [{"test": "failures/expected/image.html", "builder": "MOCK Win10"}]}\n')
@@ -355,9 +355,9 @@ class TestAbstractParallelRebaselineCommand(BaseTestCase):
self.assertEqual(baseline_paths, [
'/test.checkout/LayoutTests/passes/text-expected.png',
'/test.checkout/LayoutTests/passes/text-expected.txt',
- '/test.checkout/LayoutTests/platform/test-win-win10/passes/text-expected.txt',
- '/test.checkout/LayoutTests/platform/test-win-win7/passes/text-expected.png',
- '/test.checkout/LayoutTests/platform/test-win-win7/passes/text-expected.txt',
+ '/test.checkout/LayoutTests/platform/win-baselines/passes/text-expected.txt',
+ '/test.checkout/LayoutTests/platform/win7-baselines/passes/text-expected.png',
+ '/test.checkout/LayoutTests/platform/win7-baselines/passes/text-expected.txt',
])
def test_remove_all_pass_testharness_baselines(self):
« third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py ('K') | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698