[webkit-changes] [112955] trunk/Tools

Mon, 02 Apr 2012 15:36:13 -0700

Title: [112955] trunk/Tools
Revision
112955
Author
[email protected]
Date
2012-04-02 15:35:52 -0700 (Mon, 02 Apr 2012)

Log Message

garden-o-matic isn't able to rebaseline audio failures
https://bugs.webkit.org/show_bug.cgi?id=82957

Reviewed by Chris Rogers.

This patch just adds "wav" to the list of test suffixes and updates the
unit tests to show that we're rebaselining audio tests results now too.

* Scripts/webkitpy/tool/commands/rebaseline.py:
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
(test_rebaseline_updates_expectations_file):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (112954 => 112955)


--- trunk/Tools/ChangeLog	2012-04-02 22:33:42 UTC (rev 112954)
+++ trunk/Tools/ChangeLog	2012-04-02 22:35:52 UTC (rev 112955)
@@ -1,5 +1,19 @@
 2012-04-02  Adam Barth  <[email protected]>
 
+        garden-o-matic isn't able to rebaseline audio failures
+        https://bugs.webkit.org/show_bug.cgi?id=82957
+
+        Reviewed by Chris Rogers.
+
+        This patch just adds "wav" to the list of test suffixes and updates the
+        unit tests to show that we're rebaselining audio tests results now too.
+
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+        (test_rebaseline_updates_expectations_file):
+
+2012-04-02  Adam Barth  <[email protected]>
+
         garden-o-matic should let you listen to audio failures
         https://bugs.webkit.org/show_bug.cgi?id=82953

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (112954 => 112955)


--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py	2012-04-02 22:33:42 UTC (rev 112954)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py	2012-04-02 22:35:52 UTC (rev 112955)
@@ -47,7 +47,7 @@
 from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
 
 
-_baseline_suffix_list = ['png', 'txt']
+_baseline_suffix_list = ['png', 'wav', 'txt']
 
 
 # FIXME: Should TestResultWriter know how to compute this string?

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (112954 => 112955)


--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py	2012-04-02 22:33:42 UTC (rev 112954)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py	2012-04-02 22:35:52 UTC (rev 112955)
@@ -55,8 +55,11 @@
         tool.filesystem.write_text_file(os.path.join(lion_port.layout_tests_dir(), "fast/css/large-list-of-rules-crash.html"), "Dummy test contents")
         tool.filesystem.write_text_file(os.path.join(lion_port.layout_tests_dir(), "userscripts/another-test.html"), "Dummy test contents")
 
-        expected_stdout = "Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.png.\nRetrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.\n"
-        command._rebaseline_test_and_update_expectations("Webkit Mac10.7", "userscripts/another-test.html", None)
+        expected_stdout = """Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.png.
+Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.wav.
+Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.
+"""
+        OutputCapture().assert_outputs(self, command._rebaseline_test_and_update_expectations, ["Webkit Mac10.7", "userscripts/another-test.html", None], expected_stdout=expected_stdout)
 
         new_expectations = tool.filesystem.read_text_file(lion_port.path_to_test_expectations_file())
         self.assertEqual(new_expectations, """BUGB MAC LINUX XP DEBUG : fast/dom/Window/window-postmessage-clone-really-deep-array.html = PASS
@@ -72,7 +75,10 @@
         tool.filesystem.write_text_file(lion_port.path_to_test_expectations_file(), "BUGX MAC : userscripts/another-test.html = IMAGE\nBUGZ LINUX : userscripts/another-test.html = IMAGE\n")
         tool.filesystem.write_text_file(os.path.join(lion_port.layout_tests_dir(), "userscripts/another-test.html"), "Dummy test contents")
 
-        expected_stdout = "Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.png.\nRetrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.\n"
+        expected_stdout = """Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.png.
+Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.wav.
+Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.
+"""
         OutputCapture().assert_outputs(self, command._rebaseline_test_and_update_expectations, ["Webkit Mac10.7", "userscripts/another-test.html", None], expected_stdout=expected_stdout)
 
         new_expectations = tool.filesystem.read_text_file(lion_port.path_to_test_expectations_file())

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to