Title: [90648] trunk/Tools
- Revision
- 90648
- Author
- [email protected]
- Date
- 2011-07-08 11:47:49 -0700 (Fri, 08 Jul 2011)
Log Message
Ensure $CHANGE_LOG_EMAIL_ADDRESS is set when testing webkitpy's commit-log-editor integration
Fixes <http://webkit.org/b/64180> REGRESSION (r90564): test-webkitpy failing on multiple
bots due to commit-log-editor errors
Reviewed by Adam Barth.
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
(CommitMessageForThisCommitTest.test_commit_message_for_this_commit): Set
$CHANGE_LOG_EMAIL_ADDRESS to the patch author's email address. This ensures that
commit-log-editor can find a value for the committer's email, and that the committer and
author email addresses match, which will prevent commit-log-editor from inserting a "Patch
by" line in the commit message.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90647 => 90648)
--- trunk/Tools/ChangeLog 2011-07-08 18:37:38 UTC (rev 90647)
+++ trunk/Tools/ChangeLog 2011-07-08 18:47:49 UTC (rev 90648)
@@ -1,3 +1,19 @@
+2011-07-08 Adam Roben <[email protected]>
+
+ Ensure $CHANGE_LOG_EMAIL_ADDRESS is set when testing webkitpy's commit-log-editor integration
+
+ Fixes <http://webkit.org/b/64180> REGRESSION (r90564): test-webkitpy failing on multiple
+ bots due to commit-log-editor errors
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ (CommitMessageForThisCommitTest.test_commit_message_for_this_commit): Set
+ $CHANGE_LOG_EMAIL_ADDRESS to the patch author's email address. This ensures that
+ commit-log-editor can find a value for the committer's email, and that the committer and
+ author email addresses match, which will prevent commit-log-editor from inserting a "Patch
+ by" line in the commit message.
+
2011-07-08 Andreas Kling <[email protected]>
[Qt][WK2] Views should expose QActions for basic navigation.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (90647 => 90648)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2011-07-08 18:37:38 UTC (rev 90647)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2011-07-08 18:47:49 UTC (rev 90648)
@@ -124,6 +124,9 @@
def mock_run(*args, **kwargs):
# Note that we use a real Executive here, not a MockExecutive, so we can test that we're
# invoking commit-log-editor correctly.
+ env = os.environ.copy()
+ env['CHANGE_LOG_EMAIL_ADDRESS'] = '[email protected]'
+ kwargs['env'] = env
return Executive().run_command(*args, **kwargs)
def mock_script_path(script):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
