[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0dd75ec3498bf6e62448dab94c006b2239c4d177
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 05:34:49 2010 +0000

    2010-12-10  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.
    
            Exception seen while reporting flaky test with commit-queue.
            Just a missing include.
    
            * Scripts/webkitpy/tool/bot/flakytestreporter.py:
            * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73835 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1b78636..93288fc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-10  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.
+
+        Exception seen while reporting flaky test with commit-queue.
+        Just a missing include.
+
+        * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+        * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+
 2010-12-10  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
index 4f7f5f3..58be5b2 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
@@ -31,7 +31,7 @@ import platform
 
 from webkitpy.common.net.layouttestresults import path_for_layout_test, LayoutTestResults
 from webkitpy.common.config import urls
-from webkitpy.tool.grammar import pluralize, join_with_separators
+from webkitpy.tool.grammar import plural, pluralize, join_with_separators
 
 _log = logging.getLogger(__name__)
 
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
index 637307f..dcfd3fe 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
@@ -125,4 +125,10 @@ The dummy-queue is continuing to process your patch.
 """
         OutputCapture().assert_outputs(self, reporter.report_flaky_tests, [['foo/bar.html'], patch], expected_stderr=expected_stderr)
 
+    def test_optional_author_string(self):
+        reporter = FlakyTestReporter(MockTool(), 'dummy-queue')
+        self.assertEqual(reporter._optional_author_string([]), "")
+        self.assertEqual(reporter._optional_author_string(["foo at bar.com"]), " (author: foo at bar.com)")
+        self.assertEqual(reporter._optional_author_string(["a at b.com", "b at b.com"]), " (authors: a at b.com and b at b.com)")
+
     # report_flaky_tests is also tested by queues_unittest

-- 
WebKit Debian packaging