[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Tue Jan 5 23:57:05 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 0bd7f3eadfbf36cde43f84f6f1592f6e980bc726
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 21 07:24:18 2009 +0000
2009-12-20 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
REGRESSION: error when running commit-queue
https://bugs.webkit.org/show_bug.cgi?id=32806
Fix typo and add test!
* Scripts/modules/bugzilla.py:
* Scripts/modules/bugzilla_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52435 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7f689e2..b19176f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
2009-12-20 Adam Barth <abarth at webkit.org>
+ Reviewed by Eric Seidel.
+
+ REGRESSION: error when running commit-queue
+ https://bugs.webkit.org/show_bug.cgi?id=32806
+
+ Fix typo and add test!
+
+ * Scripts/modules/bugzilla.py:
+ * Scripts/modules/bugzilla_unittest.py:
+
+2009-12-20 Adam Barth <abarth at webkit.org>
+
[bzt] Optimize status updates for new dashboard
https://bugs.webkit.org/show_bug.cgi?id=32797
diff --git a/WebKitTools/Scripts/modules/bugzilla.py b/WebKitTools/Scripts/modules/bugzilla.py
index 5520dfe..372cabd 100644
--- a/WebKitTools/Scripts/modules/bugzilla.py
+++ b/WebKitTools/Scripts/modules/bugzilla.py
@@ -469,7 +469,7 @@ class Bugzilla(object):
def add_cc_to_bug(self, bug_id, email_address_list):
self.authenticate()
- log("Adding %s to the CC list for bug %s" % (email_address, bug_id))
+ log("Adding %s to the CC list for bug %s" % (email_address_list, bug_id))
if self.dryrun:
return
diff --git a/WebKitTools/Scripts/modules/bugzilla_unittest.py b/WebKitTools/Scripts/modules/bugzilla_unittest.py
index fb0f756..ca92722 100644
--- a/WebKitTools/Scripts/modules/bugzilla_unittest.py
+++ b/WebKitTools/Scripts/modules/bugzilla_unittest.py
@@ -30,9 +30,25 @@ import unittest
from modules.committers import CommitterList, Reviewer, Committer
from modules.bugzilla import Bugzilla, parse_bug_id
+from modules.outputcapture import OutputCapture
from modules.BeautifulSoup import BeautifulSoup
+
+class MockBrowser(object):
+ def open(self, url):
+ pass
+
+ def select_form(self, name):
+ pass
+
+ def __setitem__(self, key, value):
+ pass
+
+ def submit(self):
+ pass
+
+
class BugzillaTest(unittest.TestCase):
_example_attachment = '''
@@ -169,5 +185,13 @@ class BugzillaTest(unittest.TestCase):
bugzilla = Bugzilla()
self.assertEquals([40511, 40722, 40723], bugzilla._parse_attachment_ids_request_query(self._sample_request_page))
+ def test_add_cc_to_bug(self):
+ bugzilla = Bugzilla()
+ bugzilla.browser = MockBrowser()
+ bugzilla.authenticate = lambda: None
+ expected_stderr = "Adding ['adam at example.com'] to the CC list for bug 42\n"
+ OutputCapture().assert_outputs(self, bugzilla.add_cc_to_bug, [42, ["adam at example.com"]], expected_stderr=expected_stderr)
+
+
if __name__ == '__main__':
unittest.main()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list