| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 import codecs | 29 import codecs |
| 30 import os | 30 import os |
| 31 import shutil | 31 import shutil |
| 32 import tempfile | 32 import tempfile |
| 33 import unittest2 as unittest | 33 from webkitpy.thirdparty import unittest2 as unittest |
| 34 | 34 |
| 35 from .checkout import Checkout | 35 from .checkout import Checkout |
| 36 from .scm import SCMDetector | 36 from .scm import SCMDetector |
| 37 from .scm.scm_mock import MockSCM | 37 from .scm.scm_mock import MockSCM |
| 38 from webkitpy.common.webkit_finder import WebKitFinder | 38 from webkitpy.common.webkit_finder import WebKitFinder |
| 39 from webkitpy.common.system.executive import Executive, ScriptError | 39 from webkitpy.common.system.executive import Executive, ScriptError |
| 40 from webkitpy.common.system.filesystem import FileSystem # FIXME: This should n
ot be needed. | 40 from webkitpy.common.system.filesystem import FileSystem # FIXME: This should n
ot be needed. |
| 41 from webkitpy.common.system.filesystem_mock import MockFileSystem | 41 from webkitpy.common.system.filesystem_mock import MockFileSystem |
| 42 from webkitpy.common.system.executive_mock import MockExecutive | 42 from webkitpy.common.system.executive_mock import MockExecutive |
| 43 from webkitpy.common.system.outputcapture import OutputCapture | 43 from webkitpy.common.system.outputcapture import OutputCapture |
| 44 from webkitpy.thirdparty.mock import Mock | 44 from webkitpy.thirdparty.mock import Mock |
| 45 | 45 |
| 46 | 46 |
| 47 class CheckoutTest(unittest.TestCase): | 47 class CheckoutTest(unittest.TestCase): |
| 48 def _make_checkout(self): | 48 def _make_checkout(self): |
| 49 return Checkout(scm=MockSCM(), filesystem=MockFileSystem(), executive=Mo
ckExecutive()) | 49 return Checkout(scm=MockSCM(), filesystem=MockFileSystem(), executive=Mo
ckExecutive()) |
| 50 | 50 |
| 51 def test_apply_patch(self): | 51 def test_apply_patch(self): |
| 52 checkout = self._make_checkout() | 52 checkout = self._make_checkout() |
| 53 checkout._executive = MockExecutive(should_log=True) | 53 checkout._executive = MockExecutive(should_log=True) |
| 54 checkout._scm.script_path = lambda script: script | 54 checkout._scm.script_path = lambda script: script |
| 55 mock_patch = Mock() | 55 mock_patch = Mock() |
| 56 mock_patch.contents = lambda: "foo" | 56 mock_patch.contents = lambda: "foo" |
| 57 mock_patch.reviewer = lambda: None | 57 mock_patch.reviewer = lambda: None |
| 58 expected_logs = "MOCK run_command: ['svn-apply', '--force'], cwd=/mock-c
heckout, input=foo\n" | 58 expected_logs = "MOCK run_command: ['svn-apply', '--force'], cwd=/mock-c
heckout, input=foo\n" |
| 59 OutputCapture().assert_outputs(self, checkout.apply_patch, [mock_patch],
expected_logs=expected_logs) | 59 OutputCapture().assert_outputs(self, checkout.apply_patch, [mock_patch],
expected_logs=expected_logs) |
| OLD | NEW |