Ensure $CHANGE_LOG_EMAIL_ADDRESS is set when testing webkitpy's commit-log-editor...
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jul 2011 18:47:49 +0000 (18:47 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jul 2011 18:47:49 +0000 (18:47 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

index a65ef14..4e48815 100644 (file)
@@ -1,3 +1,19 @@
+2011-07-08  Adam Roben  <aroben@apple.com>
+
+        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  <kling@webkit.org>
 
         [Qt][WK2] Views should expose QActions for basic navigation.
index 4f226ff..46329aa 100644 (file)
@@ -124,6 +124,9 @@ Second part of this complicated change by me, Tor Arne Vestb\u00f8!
         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'] = 'vestbo@webkit.org'
+            kwargs['env'] = env
             return Executive().run_command(*args, **kwargs)
 
         def mock_script_path(script):