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

abarth at webkit.org abarth at webkit.org
Wed Dec 22 14:42:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a8b143f39f5bcbe9805c11474d4b02d01d8b13e4
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 11:42:26 2010 +0000

    2010-10-18  Adam Barth  <abarth at webkit.org>
    
            Reviewed by David Levin.
    
            commit-queue's flaky test notice is very Pythony
            https://bugs.webkit.org/show_bug.cgi?id=47790
    
            This patch make the list of tests delimted by \n instead of just
            converting the array to a string.
    
            * Scripts/webkitpy/tool/commands/queues.py:
            * Scripts/webkitpy/tool/commands/queues_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0c7de9d..1aa7e96 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-18  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by David Levin.
+
+        commit-queue's flaky test notice is very Pythony
+        https://bugs.webkit.org/show_bug.cgi?id=47790
+
+        This patch make the list of tests delimted by \n instead of just
+        converting the array to a string.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2010-10-14  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Martin Robinson and Xan Lopez.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
index df42e80..082ac40 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
@@ -290,7 +290,7 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler, CommitQueueTaskD
         return self._tool.bugs.fetch_attachment(patch.id())
 
     def report_flaky_tests(self, patch, flaky_tests):
-        message = "The %s encountered the following flaky tests while processing attachment %s:\n\n%s\n\nPlease file bugs against the tests.  The commit-queue is continuing to process your patch." % (self.name, patch.id(), flaky_tests)
+        message = "The %s encountered the following flaky tests while processing attachment %s:\n\n%s\n\nPlease file bugs against the tests.  The commit-queue is continuing to process your patch." % (self.name, patch.id(), "\n".join(flaky_tests))
         self._tool.bugs.post_comment_to_bug(patch.bug_id(), message, cc=self.watchers)
 
     # StepSequenceErrorHandler methods
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
index ad04f2b..8ac8721 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -328,7 +328,8 @@ MOCK: update_status: commit-queue Retry
 --- Begin comment ---
 The commit-queue encountered the following flaky tests while processing attachment 197:
 
-['foo/bar.html', 'bar/baz.html']
+foo/bar.html
+bar/baz.html
 
 Please file bugs against the tests.  The commit-queue is continuing to process your patch.
 --- End comment ---

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list