| Index: Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| index d7a60ee685569b43a3176cb0e81fdc6ed6b3ca70..8fedbd0f8ae7955ebb4ee2d61d051cc4ce55734b 100644
|
| --- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| +++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| @@ -450,7 +450,7 @@ class TestRebaselineJsonUpdatesExpectationsFiles(_BaseTestCase):
|
| self.command._rebaseline(options, {"userscripts/first-test.html": {"WebKit Mac10.7": ["txt", "png"]}})
|
|
|
| new_expectations = self._read(self.lion_expectations_path)
|
| - self.assertMultiLineEqual(new_expectations, "Bug(x) [ Mavericks MountainLion Retina SnowLeopard ] userscripts/first-test.html [ ImageOnlyFailure ]\nbug(z) [ Linux ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
| + self.assertMultiLineEqual(new_expectations, "Bug(x) [ Mavericks MountainLion Retina SnowLeopard Yosemite ] userscripts/first-test.html [ ImageOnlyFailure ]\nbug(z) [ Linux ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
|
|
| def test_rebaseline_updates_expectations_file_all_platforms(self):
|
| options = MockOptions(optimize=False, verbose=True, results_directory=None)
|
| @@ -462,7 +462,7 @@ class TestRebaselineJsonUpdatesExpectationsFiles(_BaseTestCase):
|
| self.command._rebaseline(options, {"userscripts/first-test.html": {"WebKit Mac10.7": ["txt", "png"]}})
|
|
|
| new_expectations = self._read(self.lion_expectations_path)
|
| - self.assertMultiLineEqual(new_expectations, "Bug(x) [ Android Linux Mavericks MountainLion Retina SnowLeopard Win ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
| + self.assertMultiLineEqual(new_expectations, "Bug(x) [ Android Linux Mavericks MountainLion Retina SnowLeopard Win Yosemite ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
|
|
| def test_rebaseline_handles_platform_skips(self):
|
| # This test is just like test_rebaseline_updates_expectations_file_all_platforms(),
|
| @@ -478,7 +478,7 @@ class TestRebaselineJsonUpdatesExpectationsFiles(_BaseTestCase):
|
| self.command._rebaseline(options, {"userscripts/first-test.html": {"WebKit Mac10.7": ["txt", "png"]}})
|
|
|
| new_expectations = self._read(self.lion_expectations_path)
|
| - self.assertMultiLineEqual(new_expectations, "Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
| + self.assertMultiLineEqual(new_expectations, "Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win Yosemite ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
|
|
| def test_rebaseline_handles_skips_in_file(self):
|
| # This test is like test_Rebaseline_handles_platform_skips, except that the
|
| @@ -497,8 +497,9 @@ class TestRebaselineJsonUpdatesExpectationsFiles(_BaseTestCase):
|
| self.command._rebaseline(options, {"userscripts/first-test.html": {"WebKit Mac10.7": ["txt", "png"]}})
|
|
|
| new_expectations = self._read(self.lion_expectations_path)
|
| - self.assertMultiLineEqual(new_expectations,
|
| - ("Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win ] userscripts/first-test.html [ ImageOnlyFailure ]\n"
|
| + self.assertMultiLineEqual(
|
| + new_expectations,
|
| + ("Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win Yosemite ] userscripts/first-test.html [ ImageOnlyFailure ]\n"
|
| "Bug(y) [ Android ] userscripts/first-test.html [ Skip ]\n"))
|
|
|
| def test_rebaseline_handles_smoke_tests(self):
|
| @@ -516,7 +517,7 @@ class TestRebaselineJsonUpdatesExpectationsFiles(_BaseTestCase):
|
| self.command._rebaseline(options, {"userscripts/first-test.html": {"WebKit Mac10.7": ["txt", "png"]}})
|
|
|
| new_expectations = self._read(self.lion_expectations_path)
|
| - self.assertMultiLineEqual(new_expectations, "Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
| + self.assertMultiLineEqual(new_expectations, "Bug(x) [ Linux Mavericks MountainLion Retina SnowLeopard Win Yosemite ] userscripts/first-test.html [ ImageOnlyFailure ]\n")
|
|
|
|
|
| class TestRebaseline(_BaseTestCase):
|
|
|