| OLD | NEW |
| 1 # Copyright (C) 2009 Google Inc. All rights reserved. | 1 # Copyright (C) 2009 Google Inc. All rights reserved. |
| 2 # Copyright (C) 2009 Apple Inc. All rights reserved. | 2 # Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 # Copyright (C) 2011 Daniel Bates (dbates@intudata.com). All rights reserved. | 3 # Copyright (C) 2011 Daniel Bates (dbates@intudata.com). All rights reserved. |
| 4 # | 4 # |
| 5 # Redistribution and use in source and binary forms, with or without | 5 # Redistribution and use in source and binary forms, with or without |
| 6 # modification, are permitted provided that the following conditions are | 6 # modification, are permitted provided that the following conditions are |
| 7 # met: | 7 # met: |
| 8 # | 8 # |
| 9 # * Redistributions of source code must retain the above copyright | 9 # * Redistributions of source code must retain the above copyright |
| 10 # notice, this list of conditions and the following disclaimer. | 10 # notice, this list of conditions and the following disclaimer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 | 30 |
| 31 import unittest | 31 import unittest |
| 32 | 32 |
| 33 from webkitpy.common.system.executive import Executive, ScriptError | 33 from webkitpy.common.system.executive import Executive, ScriptError |
| 34 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 | 34 from webkitpy.common.system.executive_mock import MockExecutive |
| 35 from webkitpy.common.system.filesystem import FileSystem | 35 from webkitpy.common.system.filesystem import FileSystem |
| 36 from webkitpy.common.system.filesystem_mock import MockFileSystem | 36 from webkitpy.common.system.filesystem_mock import MockFileSystem |
| 37 from webkitpy.common.checkout.scm.detection import detect_scm_system | 37 from webkitpy.common.checkout.scm.detection import detect_scm_system |
| 38 from webkitpy.common.checkout.scm.git import AmbiguousCommitError | |
| 39 from webkitpy.common.checkout.scm.git import Git | 38 from webkitpy.common.checkout.scm.git import Git |
| 40 from webkitpy.common.checkout.scm.scm import SCM | |
| 41 | 39 |
| 42 | 40 |
| 43 class SCMTestBase(unittest.TestCase): | 41 class SCMTestBase(unittest.TestCase): |
| 44 | 42 |
| 45 def __init__(self, *args, **kwargs): | 43 def __init__(self, *args, **kwargs): |
| 46 super(SCMTestBase, self).__init__(*args, **kwargs) | 44 super(SCMTestBase, self).__init__(*args, **kwargs) |
| 47 self.scm = None | 45 self.scm = None |
| 48 self.executive = None | 46 self.executive = None |
| 49 self.fs = None | 47 self.fs = None |
| 50 self.original_cwd = None | 48 self.original_cwd = None |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 scm = self.make_scm() | 245 scm = self.make_scm() |
| 248 scm.find_checkout_root = lambda path: '' | 246 scm.find_checkout_root = lambda path: '' |
| 249 scm._run_git = lambda args: 'Date: 2013-02-08 08:05:49 +0000' | 247 scm._run_git = lambda args: 'Date: 2013-02-08 08:05:49 +0000' |
| 250 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-08T08:05:49Z') | 248 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-08T08:05:49Z') |
| 251 | 249 |
| 252 scm._run_git = lambda args: 'Date: 2013-02-08 01:02:03 +0130' | 250 scm._run_git = lambda args: 'Date: 2013-02-08 01:02:03 +0130' |
| 253 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-07T23:32:03Z') | 251 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-07T23:32:03Z') |
| 254 | 252 |
| 255 scm._run_git = lambda args: 'Date: 2013-02-08 01:55:21 -0800' | 253 scm._run_git = lambda args: 'Date: 2013-02-08 01:55:21 -0800' |
| 256 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-08T09:55:21Z') | 254 self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-
02-08T09:55:21Z') |
| OLD | NEW |