Allow text expectation for reftests

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 278 matching lines @@
         self._write("userscripts/another-test.html", "test data")
         self._write(self.mac_expectations_path,
                     "Bug(x) [ Mac ] userscripts/another-test.html [ Failure ]\nbug(z) [ Linux ] userscripts/another-test.html [ Failure ]\n")
         self.options.results_directory = '/tmp'
         self.command._rebaseline_test_and_update_expectations(self.options)
         self.assertItemsEqual(self.tool.web.urls_fetched, ['file:///tmp/userscripts/another-test-actual.txt'])
 
     def test_rebaseline_reftest(self):
         self._write("userscripts/another-test.html", "test data")
         self._write("userscripts/another-test-expected.html", "generic result")
+        self.options.suffixes = 'png'
         OutputCapture().assert_outputs(self, self.command._rebaseline_test_and_update_expectations, args=[self.options],
-                                       expected_logs="Cannot rebaseline reftest: userscripts/another-test.html\n")
+                                       expected_logs="Cannot rebaseline image result for reftest: userscripts/another-test.html\n")
         self.assertDictEqual(self.command._scm_changes, {'add': [], 'remove-lines': [], "delete": []})
 
     def test_rebaseline_test_and_print_scm_changes(self):
         self.command._print_scm_changes = True
         self.command._scm_changes = {'add': [], 'delete': []}
         self.tool._scm.exists = lambda x: False
 
         self.command._rebaseline_test("WebKit Linux Trusty", "userscripts/another-test.html", "txt", None)
 
         self.assertDictEqual(self.command._scm_changes, {
@@ skipping 390 matching lines @@
                     '--builder', 'MOCK Mac10.10', '--test', 'userscripts/another-test.html'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
                     '--builder', 'MOCK Mac10.11', '--test', 'userscripts/another-test.html'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
                     '--builder', 'MOCK Mac10.10', '--test', 'userscripts/images.svg'],
                 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png',
                     '--builder', 'MOCK Mac10.11', '--test', 'userscripts/images.svg'],
             ],
         ])
 
+    def test_rebaseline_expectations_reftests(self):
+        self._zero_out_test_expectations()
+
+        self.tool.executive = MockExecutive2()
+
+        def builder_data():
+            self.command._builder_data['MOCK Mac10.10'] = self.command._builder_data['MOCK Mac10.11'] = LayoutTestResults.results_from_string("""ADD_RESULTS({
+    "tests": {
+        "userscripts": {
+            "reftest-text.html": {
+                "expected": "PASS",
+                "actual": "TEXT"
+            },
+            "reftest-image.html": {
+                "expected": "FAIL",
+                "actual": "IMAGE"
+            },
+            "reftest-image-text.html": {
+                "expected": "FAIL",
+                "actual": "IMAGE+TEXT"
+            }
+        }
+    }
+});""")
+            return self.command._builder_data
+
+        self.command.builder_data = builder_data
+
+        self._write("userscripts/reftest-text.html", "Dummy test contents")
+        self._write("userscripts/reftest-text-expected.html", "Dummy test contents")
+        self._write("userscripts/reftest-text-expected.html", "Dummy test contents")
+        self.command._tests_to_rebaseline = lambda port: {
+            'userscripts/reftest-text.html': set(['txt']),
+            'userscripts/reftest-image.html': set(['png']),
+            'userscripts/reftest-image-text.html': set(['png', 'txt']),
+        }
+
+        self.tool.builders = FakeBuilders({
+            "MOCK Mac10.10": {"port_name": "test-mac-mac10.10", "specifiers": set(["mock-specifier"])},
+            "MOCK Mac10.11": {"port_name": "test-mac-mac10.11", "specifiers": set(["mock-specifier"])},
+        })
+        self.command.execute(self.options, [], self.tool)
+
+        # FIXME: change this to use the test- ports.
+        calls = filter(lambda x: x != ['qmake', '-v'], self.tool.executive.calls)
+
+        self.assertEqual(self.tool.executive.calls, [
+            [
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
+                    '--builder', 'MOCK Mac10.10', '--test', 'userscripts/reftest-text.html'],
+                ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
+                    '--builder', 'MOCK Mac10.11', '--test', 'userscripts/reftest-text.html'],
+            ],
+            [
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
+                    '--builder', 'MOCK Mac10.10', '--test', 'userscripts/reftest-text.html'],
+                ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
+                    '--builder', 'MOCK Mac10.11', '--test', 'userscripts/reftest-text.html'],
+            ],
+        ])
+
     def test_rebaseline_expectations_noop(self):
         self._zero_out_test_expectations()
 
         oc = OutputCapture()
         try:
             oc.capture_output()
             self.command.execute(self.options, [], self.tool)
         finally:
             _, _, logs = oc.restore_output()
             self.assertEqual(self.tool.filesystem.written_files, {})
@@ skipping 712 matching lines @@
                 ['git', 'cl', 'upload', '-f', '--auth-refresh-token-json', RIETVELD_REFRESH_TOKEN],
                 ['git', 'pull'],
                 ['git', 'cl', 'land', '-f', '-v', '--auth-refresh-token-json', RIETVELD_REFRESH_TOKEN],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
             ],
             auth_refresh_token_json=RIETVELD_REFRESH_TOKEN)
 
     def test_execute_with_dry_run(self):
         self._basic_execute_test([], dry_run=True)
         self.assertEqual(self.tool.scm().local_commits(), [])