Log Message
Fix webkitpy tests after r183471.
* Scripts/webkitpy/port/mac_unittest.py: (test_baseline_search_path): Taught about mac-mavericks. * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: (TestRebaselineTest.test_baseline_directory): Ditto.
Modified Paths
Diff
Modified: branches/safari-600.6-branch/Tools/ChangeLog (183473 => 183474)
--- branches/safari-600.6-branch/Tools/ChangeLog 2015-04-28 14:37:10 UTC (rev 183473)
+++ branches/safari-600.6-branch/Tools/ChangeLog 2015-04-28 15:03:06 UTC (rev 183474)
@@ -1,5 +1,14 @@
2015-04-28 Andy Estes <[email protected]>
+ Fix webkitpy tests after r183471.
+
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (test_baseline_search_path): Taught about mac-mavericks.
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaselineTest.test_baseline_directory): Ditto.
+
+2015-04-28 Andy Estes <[email protected]>
+
Tell mac.py about 'mac-yosemite' so that fallback to 'mac-mavericks' works properly.
* Scripts/webkitpy/port/mac.py:
Modified: branches/safari-600.6-branch/Tools/Scripts/webkitpy/port/mac_unittest.py (183473 => 183474)
--- branches/safari-600.6-branch/Tools/Scripts/webkitpy/port/mac_unittest.py 2015-04-28 14:37:10 UTC (rev 183473)
+++ branches/safari-600.6-branch/Tools/Scripts/webkitpy/port/mac_unittest.py 2015-04-28 15:03:06 UTC (rev 183474)
@@ -123,15 +123,17 @@
def test_baseline_search_path(self):
# Note that we don't need total coverage here, just path coverage, since this is all data driven.
- self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-mavericks', 'mac-wk1', ['mac-wk1', 'mac'])
+ self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-mavericks', 'mac-mavericks', ['mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-yosemite', 'mac-wk1', ['mac-wk1', 'mac'])
self._assert_search_path('mac-future', 'mac-wk1', ['mac-wk1', 'mac'])
- self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-yosemite', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
def test_show_results_html_file(self):
Modified: branches/safari-600.6-branch/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (183473 => 183474)
--- branches/safari-600.6-branch/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2015-04-28 14:37:10 UTC (rev 183473)
+++ branches/safari-600.6-branch/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2015-04-28 15:03:06 UTC (rev 183474)
@@ -89,7 +89,7 @@
self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mountainlion")
self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
- self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
+ self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mavericks")
self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
