Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

1 files changed, 25 insertions, 19 deletions

diff --git a/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py b/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py
index e99caee..1436379 100644
--- a/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py
@@ -26,6 +26,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import with_statement
+
+import codecs
 import os
 import shutil
 import tempfile
@@ -37,14 +40,14 @@ from webkitpy.common.checkout.scm import detect_scm_system, CommitMessage
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.thirdparty.mock import Mock
 
+
 # FIXME: Copied from scm_unittest.py
-def write_into_file_at_path(file_path, contents):
-    new_file = open(file_path, 'w')
-    new_file.write(contents)
-    new_file.close()
+def write_into_file_at_path(file_path, contents, encoding="utf-8"):
+    with codecs.open(file_path, "w", encoding) as file:
+        file.write(contents)
 
 
-_changelog1entry1 = """2010-03-25  Eric Seidel  <eric@webkit.org>
+_changelog1entry1 = u"""2010-03-25  Tor Arne Vestb\u00f8  <vestbo@webkit.org>
 
         Unreviewed build fix to un-break webkit-patch land.
 
@@ -53,7 +56,7 @@ _changelog1entry1 = """2010-03-25  Eric Seidel  <eric@webkit.org>
 
         * Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage
 """
-_changelog1entry2 = """2010-03-25  Adam Barth  <abarth@webkit.org>
+_changelog1entry2 = u"""2010-03-25  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
 
@@ -62,8 +65,8 @@ _changelog1entry2 = """2010-03-25  Adam Barth  <abarth@webkit.org>
 
         * Scripts/webkitpy/common/checkout/api.py:
 """
-_changelog1 = "\n".join([_changelog1entry1, _changelog1entry2])
-_changelog2 = """2010-03-25  Eric Seidel  <eric@webkit.org>
+_changelog1 = u"\n".join([_changelog1entry1, _changelog1entry2])
+_changelog2 = u"""2010-03-25  Tor Arne Vestb\u00f8  <vestbo@webkit.org>
 
         Unreviewed build fix to un-break webkit-patch land.
 
@@ -79,7 +82,7 @@ _changelog2 = """2010-03-25  Eric Seidel  <eric@webkit.org>
 """
 
 class CommitMessageForThisCommitTest(unittest.TestCase):
-    expected_commit_message = """2010-03-25  Eric Seidel  <eric@webkit.org>
+    expected_commit_message = u"""2010-03-25  Tor Arne Vestb\u00f8  <vestbo@webkit.org>
 
         Unreviewed build fix to un-break webkit-patch land.
 
@@ -87,7 +90,7 @@ class CommitMessageForThisCommitTest(unittest.TestCase):
         https://bugs.webkit.org/show_bug.cgi?id=36629
 
         * Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage
-2010-03-25  Eric Seidel  <eric@webkit.org>
+2010-03-25  Tor Arne Vestb\u00f8  <vestbo@webkit.org>
 
         Unreviewed build fix to un-break webkit-patch land.
 
@@ -111,10 +114,11 @@ class CommitMessageForThisCommitTest(unittest.TestCase):
     # ChangeLog is difficult to mock at current.
     def test_commit_message_for_this_commit(self):
         checkout = Checkout(None)
-        checkout.modified_changelogs = lambda: ["ChangeLog1", "ChangeLog2"]
+        checkout.modified_changelogs = lambda git_commit, squash: ["ChangeLog1", "ChangeLog2"]
         output = OutputCapture()
         expected_stderr = "Parsing ChangeLog: ChangeLog1\nParsing ChangeLog: ChangeLog2\n"
-        commit_message = output.assert_outputs(self, checkout.commit_message_for_this_commit, expected_stderr=expected_stderr)
+        commit_message = output.assert_outputs(self, checkout.commit_message_for_this_commit,
+            kwargs={"git_commit": None, "squash": False}, expected_stderr=expected_stderr)
         self.assertEqual(commit_message.message(), self.expected_commit_message)
 
 
@@ -124,7 +128,9 @@ class CheckoutTest(unittest.TestCase):
         def mock_contents_at_revision(changelog_path, revision):
             self.assertEqual(changelog_path, "foo")
             self.assertEqual(revision, "bar")
-            return _changelog1
+            # contents_at_revision is expected to return a byte array (str)
+            # so we encode our unicode ChangeLog down to a utf-8 stream.
+            return _changelog1.encode("utf-8")
         scm.contents_at_revision = mock_contents_at_revision
         checkout = Checkout(scm)
         entry = checkout._latest_entry_for_changelog_at_revision("foo", "bar")
@@ -137,8 +143,8 @@ class CheckoutTest(unittest.TestCase):
         checkout.changelog_entries_for_revision = lambda revision: [ChangeLogEntry(_changelog1entry1)]
         commitinfo = checkout.commit_info_for_revision(4)
         self.assertEqual(commitinfo.bug_id(), 36629)
-        self.assertEqual(commitinfo.author_name(), "Eric Seidel")
-        self.assertEqual(commitinfo.author_email(), "eric@webkit.org")
+        self.assertEqual(commitinfo.author_name(), u"Tor Arne Vestb\u00f8")
+        self.assertEqual(commitinfo.author_email(), "vestbo@webkit.org")
         self.assertEqual(commitinfo.reviewer_text(), None)
         self.assertEqual(commitinfo.reviewer(), None)
         self.assertEqual(commitinfo.committer_email(), "committer@example.com")
@@ -157,13 +163,13 @@ class CheckoutTest(unittest.TestCase):
     def test_bug_id_for_this_commit(self):
         scm = Mock()
         checkout = Checkout(scm)
-        checkout.commit_message_for_this_commit = lambda: CommitMessage(ChangeLogEntry(_changelog1entry1).contents().splitlines())
-        self.assertEqual(checkout.bug_id_for_this_commit(), 36629)
+        checkout.commit_message_for_this_commit = lambda git_commit, squash: CommitMessage(ChangeLogEntry(_changelog1entry1).contents().splitlines())
+        self.assertEqual(checkout.bug_id_for_this_commit(git_commit=None, squash=False), 36629)
 
     def test_modified_changelogs(self):
         scm = Mock()
         scm.checkout_root = "/foo/bar"
-        scm.changed_files = lambda:["file1", "ChangeLog", "relative/path/ChangeLog"]
+        scm.changed_files = lambda git_commit, squash: ["file1", "ChangeLog", "relative/path/ChangeLog"]
         checkout = Checkout(scm)
         expected_changlogs = ["/foo/bar/ChangeLog", "/foo/bar/relative/path/ChangeLog"]
-        self.assertEqual(checkout.modified_changelogs(), expected_changlogs)
+        self.assertEqual(checkout.modified_changelogs(git_commit=None, squash=False), expected_changlogs)