Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

1 files changed, 72 insertions, 11 deletions

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index e050cba..1c751d6 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -29,6 +29,7 @@
 
 """Unit tests for run_webkit_tests."""
 
+import codecs
 import os
 import sys
 import unittest
@@ -62,39 +63,99 @@ def logging_run(args):
 
 class MainTest(unittest.TestCase):
     def test_fast(self):
+        self.assertTrue(passing_run(['--platform', 'test']))
+        self.assertTrue(passing_run(['--platform', 'test', '--run-singly']))
         self.assertTrue(passing_run(['--platform', 'test',
-                                     'fast/html']))
-        self.assertTrue(passing_run(['--platform', 'test',
-                                     '--run-singly',
-                                     'fast/html']))
-        self.assertTrue(passing_run(['--platform', 'test',
-                                     'fast/html/article-element.html']))
+                                     'text/article-element.html']))
         self.assertTrue(passing_run(['--platform', 'test',
                                     '--child-processes', '1',
-                                     '--print', 'unexpected',
-                                     'fast/html']))
+                                     '--print', 'unexpected']))
 
     def test_child_processes(self):
         (res, buildbot_output, regular_output) = logging_run(
              ['--platform', 'test', '--print', 'config', '--child-processes',
-              '1', 'fast/html'])
+              '1'])
         self.assertTrue('Running one DumpRenderTree\n'
                         in regular_output.get())
 
         (res, buildbot_output, regular_output) = logging_run(
              ['--platform', 'test', '--print', 'config', '--child-processes',
-              '2', 'fast/html'])
+              '2'])
         self.assertTrue('Running 2 DumpRenderTrees in parallel\n'
                         in regular_output.get())
 
     def test_last_results(self):
-        passing_run(['--platform', 'test', 'fast/html'])
+        passing_run(['--platform', 'test'])
         (res, buildbot_output, regular_output) = logging_run(
             ['--platform', 'test', '--print-last-failures'])
         self.assertEqual(regular_output.get(), ['\n\n'])
         self.assertEqual(buildbot_output.get(), [])
 
 
+def _mocked_open(original_open, file_list):
+    def _wrapper(name, mode, encoding):
+        if name.find("-expected.") != -1 and mode == "w":
+            # we don't want to actually write new baselines, so stub these out
+            name.replace('\\', '/')
+            file_list.append(name)
+            return original_open(os.devnull, mode, encoding)
+        return original_open(name, mode, encoding)
+    return _wrapper
+
+
+class RebaselineTest(unittest.TestCase):
+    def assertBaselines(self, file_list, file):
+        "assert that the file_list contains the baselines."""
+        for ext in [".txt", ".png", ".checksum"]:
+            baseline = file + "-expected" + ext
+            self.assertTrue(any(f.find(baseline) != -1 for f in file_list))
+
+    def test_reset_results(self):
+        file_list = []
+        original_open = codecs.open
+        try:
+            # Test that we update expectations in place. If the expectation
+            # is mssing, update the expected generic location.
+            file_list = []
+            codecs.open = _mocked_open(original_open, file_list)
+            passing_run(['--platform', 'test', '--pixel-tests',
+                         '--reset-results',
+                         'image/canvas-bg.html',
+                         'image/canvas-zoom.html',
+                         'misc/missing-expectation.html'])
+            self.assertEqual(len(file_list), 9)
+            self.assertBaselines(file_list,
+                "data/image/canvas-zoom")
+            self.assertBaselines(file_list,
+                "data/platform/test/image/canvas-bg")
+            self.assertBaselines(file_list,
+                "data/misc/missing-expectation")
+        finally:
+            codecs.open = original_open
+
+    def test_new_baseline(self):
+        file_list = []
+        original_open = codecs.open
+        try:
+            # Test that we update the platform expectations. If the expectation
+            # is mssing, then create a new expectation in the platform dir.
+            file_list = []
+            codecs.open = _mocked_open(original_open, file_list)
+            passing_run(['--platform', 'test', '--pixel-tests',
+                         '--new-baseline',
+                         'image/canvas-zoom.html',
+                         'image/canvas-bg.html',
+                         'misc/missing-expectation.html'])
+            self.assertEqual(len(file_list), 9)
+            self.assertBaselines(file_list,
+                "data/platform/test/image/canvas-zoom")
+            self.assertBaselines(file_list,
+                "data/platform/test/image/canvas-bg")
+            self.assertBaselines(file_list,
+                "data/platform/test/misc/missing-expectation")
+        finally:
+            codecs.open = original_open
+
 class TestRunnerTest(unittest.TestCase):
     def test_results_html(self):
         mock_port = Mock()