Index: Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py |
diff --git a/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py b/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py |
index 2ca75fc578b04ba72ea045caef04c86dce55b182..72ac9caf7816f07ccec52c94bec47b73ef4fc7c3 100644 |
--- a/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py |
+++ b/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py |
@@ -33,7 +33,7 @@ import tempfile |
import unittest2 as unittest |
from .checkout import Checkout |
-from .scm import CommitMessage, SCMDetector |
+from .scm import SCMDetector |
from .scm.scm_mock import MockSCM |
from webkitpy.common.webkit_finder import WebKitFinder |
from webkitpy.common.system.executive import Executive, ScriptError |
@@ -44,82 +44,6 @@ from webkitpy.common.system.outputcapture import OutputCapture |
from webkitpy.thirdparty.mock import Mock |
-_changelog1entry1 = u"""2010-03-25 Tor Arne Vestb\u00f8 <vestbo@webkit.org> |
- |
- Unreviewed build fix to un-break webkit-patch land. |
- |
- Move commit_message_for_this_commit from scm to checkout |
- https://bugs.webkit.org/show_bug.cgi?id=36629 |
- |
- * Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage |
-""" |
-_changelog1entry2 = u"""2010-03-25 Adam Barth <abarth@webkit.org> |
- |
- Reviewed by Eric Seidel. |
- |
- Move commit_message_for_this_commit from scm to checkout |
- https://bugs.webkit.org/show_bug.cgi?id=36629 |
- |
- * Scripts/webkitpy/common/checkout/api.py: |
-""" |
-_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. |
- |
- Second part of this complicated change by me, Tor Arne Vestb\u00f8! |
- |
- * Path/To/Complicated/File: Added. |
- |
-2010-03-25 Adam Barth <abarth@webkit.org> |
- |
- Reviewed by Eric Seidel. |
- |
- Filler change. |
-""" |
- |
-class CommitMessageForThisCommitTest(unittest.TestCase): |
- expected_commit_message = u"""Unreviewed build fix to un-break webkit-patch land. |
- |
-Tools: |
- |
-Move commit_message_for_this_commit from scm to checkout |
-https://bugs.webkit.org/show_bug.cgi?id=36629 |
- |
-* Scripts/webkitpy/common/checkout/api.py: import scm.CommitMessage |
- |
-LayoutTests: |
- |
-Second part of this complicated change by me, Tor Arne Vestb\u00f8! |
- |
-* Path/To/Complicated/File: Added. |
-""" |
- |
- def setUp(self): |
- # FIXME: This should not need to touch the filesystem, however |
- # ChangeLog is difficult to mock at current. |
- self.filesystem = FileSystem() |
- self.temp_dir = str(self.filesystem.mkdtemp(suffix="changelogs")) |
- self.old_cwd = self.filesystem.getcwd() |
- self.filesystem.chdir(self.temp_dir) |
- self.webkit_base = WebKitFinder(self.filesystem).webkit_base() |
- |
- # Trick commit-log-editor into thinking we're in a Subversion working copy so it won't |
- # complain about not being able to figure out what SCM is in use. |
- # FIXME: VCSTools.pm is no longer so easily fooled. It logs because "svn info" doesn't |
- # treat a bare .svn directory being part of an svn checkout. |
- self.filesystem.maybe_make_directory(".svn") |
- |
- self.changelogs = map(self.filesystem.abspath, (self.filesystem.join("Tools", "ChangeLog"), self.filesystem.join("LayoutTests", "ChangeLog"))) |
- for path, contents in zip(self.changelogs, (_changelog1, _changelog2)): |
- self.filesystem.maybe_make_directory(self.filesystem.dirname(path)) |
- self.filesystem.write_text_file(path, contents) |
- |
- def tearDown(self): |
- self.filesystem.rmtree(self.temp_dir) |
- self.filesystem.chdir(self.old_cwd) |
- |
- |
class CheckoutTest(unittest.TestCase): |
def _make_checkout(self): |
return Checkout(scm=MockSCM(), filesystem=MockFileSystem(), executive=MockExecutive()) |