msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1 | #!/usr/bin/python |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 2 | # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 5 | |
| 6 | """Unit tests for gclient_scm.py.""" |
| 7 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 8 | # pylint: disable=E1101,E1103,W0403 |
| 9 | |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 10 | # Import before super_mox to keep valid references. |
| 11 | from os import rename |
| 12 | from shutil import rmtree |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 13 | from subprocess import Popen, PIPE, STDOUT |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 14 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 15 | import unittest |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 16 | import __builtin__ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 17 | |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 18 | # Fixes include path. |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 19 | from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 20 | |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 21 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 22 | import gclient_scm |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 23 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 24 | # Shortcut since this function is used often |
| 25 | join = gclient_scm.os.path.join |
| 26 | |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 27 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 28 | class GCBaseTestCase(object): |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 29 | def assertRaisesError(self, msg, fn, *args, **kwargs): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 30 | """Like unittest's assertRaises() but checks for Gclient.Error.""" |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 31 | try: |
| 32 | fn(*args, **kwargs) |
| 33 | except gclient_scm.gclient_utils.Error, e: |
| 34 | self.assertEquals(e.args[0], msg) |
| 35 | else: |
| 36 | self.fail('%s not raised' % msg) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 37 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 38 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 39 | class BaseTestCase(GCBaseTestCase, SuperMoxTestBase): |
| 40 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 41 | SuperMoxTestBase.setUp(self) |
| 42 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCall') |
| 43 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') |
| 44 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, |
| 45 | 'CheckCallAndFilterAndHeader') |
| 46 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') |
| 47 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') |
| 48 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'Popen') |
| 49 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory') |
| 50 | self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo |
| 51 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture') |
| 52 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureInfo') |
| 53 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus') |
| 54 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList') |
| 55 | self._scm_wrapper = gclient_scm.CreateSCM |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 56 | gclient_scm.scm.SVN.current_version = None |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 57 | # Absolute path of the fake checkout directory. |
| 58 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 59 | |
| 60 | def tearDown(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 61 | SuperMoxTestBase.tearDown(self) |
| 62 | |
| 63 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 64 | class SVNWrapperTestCase(BaseTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 65 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 66 | def __init__(self, verbose=False, revision=None): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 67 | self.verbose = verbose |
| 68 | self.revision = revision |
| 69 | self.manually_grab_svn_rev = True |
| 70 | self.deps_os = None |
| 71 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 72 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 73 | self.nohooks = False |
| 74 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 75 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 76 | return self.OptionsObject(*args, **kwargs) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 77 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 78 | def setUp(self): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 79 | BaseTestCase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 80 | self.url = self.SvnUrl() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 81 | |
| 82 | def testDir(self): |
| 83 | members = [ |
maruel@chromium.org | 2b9aa8e | 2010-08-25 20:01:42 +0000 | [diff] [blame] | 84 | 'FullUrlForRelativeUrl', 'RunCommand', |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 85 | 'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert', |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 86 | 'revinfo', 'runhooks', 'status', 'update', |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 87 | 'updatesingle', 'url', |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 88 | ] |
| 89 | |
| 90 | # If you add a member, be sure to add the relevant test! |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 91 | self.compareMembers(self._scm_wrapper('svn://a'), members) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 92 | |
| 93 | def testUnsupportedSCM(self): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 94 | args = ['gopher://foo', self.root_dir, self.relpath] |
| 95 | exception_msg = 'No SCM found for url gopher://foo' |
| 96 | self.assertRaisesError(exception_msg, self._scm_wrapper, *args) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 97 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 98 | def testSVNFullUrlForRelativeUrl(self): |
| 99 | self.url = 'svn://a/b/c/d' |
| 100 | |
| 101 | self.mox.ReplayAll() |
| 102 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 103 | relpath=self.relpath) |
| 104 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap') |
| 105 | |
| 106 | def testGITFullUrlForRelativeUrl(self): |
| 107 | self.url = 'git://a/b/c/d' |
| 108 | |
| 109 | self.mox.ReplayAll() |
| 110 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 111 | relpath=self.relpath) |
| 112 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'git://a/b/c/crap') |
| 113 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 114 | def testRunCommandException(self): |
| 115 | options = self.Options(verbose=False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 116 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 117 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 118 | |
| 119 | self.mox.ReplayAll() |
| 120 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 121 | relpath=self.relpath) |
| 122 | exception = "Unsupported argument(s): %s" % ','.join(self.args) |
| 123 | self.assertRaisesError(exception, scm.RunCommand, |
| 124 | 'update', options, self.args) |
| 125 | |
| 126 | def testRunCommandUnknown(self): |
| 127 | # TODO(maruel): if ever used. |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 128 | pass |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 129 | |
| 130 | def testRevertMissing(self): |
| 131 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 132 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | 2b9aa8e | 2010-08-25 20:01:42 +0000 | [diff] [blame] | 133 | gclient_scm.scm.SVN.Capture(['--version'] |
| 134 | ).AndReturn('svn, version 1.5.1 (r32289)') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 135 | # It'll to a checkout instead. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 136 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 137 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 138 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 139 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 140 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 141 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 142 | options.verbose, |
| 143 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 144 | cwd=self.root_dir, |
| 145 | file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 146 | |
| 147 | self.mox.ReplayAll() |
| 148 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 149 | relpath=self.relpath) |
| 150 | scm.revert(options, self.args, files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 151 | self.checkstdout( |
| 152 | ('\n_____ %s is missing, synching instead\n' % self.relpath)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 153 | |
| 154 | def testRevertNone(self): |
| 155 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 156 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 157 | gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn([]) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 158 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 159 | options.verbose, |
| 160 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 161 | cwd=self.base_path, |
| 162 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 163 | |
| 164 | self.mox.ReplayAll() |
| 165 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 166 | relpath=self.relpath) |
| 167 | file_list = [] |
| 168 | scm.revert(options, self.args, file_list) |
| 169 | |
| 170 | def testRevert2Files(self): |
| 171 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 172 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 173 | items = [ |
| 174 | ('M ', 'a'), |
| 175 | ('A ', 'b'), |
| 176 | ] |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 177 | file_path1 = join(self.base_path, 'a') |
| 178 | file_path2 = join(self.base_path, 'b') |
| 179 | gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 180 | gclient_scm.os.path.exists(file_path1).AndReturn(True) |
| 181 | gclient_scm.os.path.isfile(file_path1).AndReturn(True) |
| 182 | gclient_scm.os.remove(file_path1) |
| 183 | gclient_scm.os.path.exists(file_path2).AndReturn(True) |
| 184 | gclient_scm.os.path.isfile(file_path2).AndReturn(True) |
| 185 | gclient_scm.os.remove(file_path2) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 186 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 187 | options.verbose, |
| 188 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 189 | cwd=self.base_path, |
| 190 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 191 | |
| 192 | self.mox.ReplayAll() |
| 193 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 194 | relpath=self.relpath) |
| 195 | file_list = [] |
| 196 | scm.revert(options, self.args, file_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 197 | self.checkstdout( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 198 | ('%s\n%s\n' % (join(self.base_path, 'a'), |
| 199 | join(self.base_path, 'b')))) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 200 | |
| 201 | def testRevertDirectory(self): |
| 202 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 203 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 204 | items = [ |
| 205 | ('~ ', 'a'), |
| 206 | ] |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 207 | gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items) |
| 208 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 209 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 210 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
msb@chromium.org | 32906d1 | 2010-01-12 18:22:09 +0000 | [diff] [blame] | 211 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 212 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 213 | gclient_scm.gclient_utils.RemoveDirectory(file_path) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 214 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 215 | options.verbose, |
| 216 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 217 | cwd=self.base_path, |
| 218 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 219 | |
| 220 | self.mox.ReplayAll() |
| 221 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 222 | relpath=self.relpath) |
| 223 | file_list2 = [] |
| 224 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 225 | self.checkstdout(('%s\n' % file_path)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 226 | |
| 227 | def testStatus(self): |
| 228 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 229 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 230 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 231 | options.verbose, |
| 232 | ['status'] + self.args + ['--ignore-externals'], |
| 233 | cwd=self.base_path, |
| 234 | file_list=[]).AndReturn(None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 235 | |
| 236 | self.mox.ReplayAll() |
| 237 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 238 | relpath=self.relpath) |
| 239 | file_list = [] |
| 240 | self.assertEqual(scm.status(options, self.args, file_list), None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 241 | |
| 242 | # TODO(maruel): TEST REVISIONS!!! |
| 243 | # TODO(maruel): TEST RELOCATE!!! |
| 244 | def testUpdateCheckout(self): |
| 245 | options = self.Options(verbose=True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 246 | file_info = gclient_scm.gclient_utils.PrintableObject() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 247 | file_info.root = 'blah' |
| 248 | file_info.url = self.url |
| 249 | file_info.uuid = 'ABC' |
| 250 | file_info.revision = 42 |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 251 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 252 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 253 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 254 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 255 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 256 | gclient_scm.scm.SVN.Capture(['--version'] |
| 257 | ).AndReturn('svn, version 1.5.1 (r32289)') |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 258 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 259 | options.verbose, |
| 260 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 261 | cwd=self.root_dir, |
| 262 | file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 263 | self.mox.ReplayAll() |
| 264 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 265 | relpath=self.relpath) |
| 266 | scm.update(options, (), files_list) |
| 267 | |
| 268 | def testUpdateUpdate(self): |
| 269 | options = self.Options(verbose=True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 270 | options.force = True |
| 271 | options.nohooks = False |
| 272 | file_info = { |
| 273 | 'Repository Root': 'blah', |
| 274 | 'URL': self.url, |
| 275 | 'UUID': 'ABC', |
| 276 | 'Revision': 42, |
| 277 | } |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 278 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 279 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 280 | |
| 281 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 282 | dotted_path = join(self.base_path, '.') |
| 283 | gclient_scm.scm.SVN.CaptureStatus(dotted_path).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 284 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 285 | # Checkout or update. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 286 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 287 | gclient_scm.scm.SVN.CaptureInfo(dotted_path).AndReturn(file_info) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 288 | # Cheat a bit here. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 289 | gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 290 | additional_args = [] |
| 291 | if options.manually_grab_svn_rev: |
| 292 | additional_args = ['--revision', str(file_info['Revision'])] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 293 | gclient_scm.scm.SVN.Capture(['--version'] |
| 294 | ).AndReturn('svn, version 1.5.1 (r32289)') |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 295 | additional_args.extend(['--force', '--ignore-externals']) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 296 | files_list = [] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 297 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | 0380707 | 2010-08-16 17:18:44 +0000 | [diff] [blame] | 298 | options.verbose, |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 299 | ['update', self.base_path] + additional_args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 300 | cwd=self.root_dir, file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 301 | |
| 302 | self.mox.ReplayAll() |
| 303 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 304 | relpath=self.relpath) |
| 305 | scm.update(options, (), files_list) |
| 306 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 307 | def testUpdateSingleCheckout(self): |
| 308 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 309 | file_info = { |
| 310 | 'URL': self.url, |
| 311 | 'Revision': 42, |
| 312 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 313 | |
| 314 | # Checks to make sure that we support svn co --depth. |
| 315 | gclient_scm.scm.SVN.current_version = None |
| 316 | gclient_scm.scm.SVN.Capture(['--version'] |
| 317 | ).AndReturn('svn, version 1.5.1 (r32289)') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 318 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
| 319 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 320 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 321 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 322 | dotted_path = join(self.base_path, '.') |
| 323 | gclient_scm.scm.SVN.CaptureStatus(dotted_path).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 324 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 325 | # When checking out a single file, we issue an svn checkout and svn update. |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 326 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 327 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 328 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 329 | always=True, |
| 330 | cwd=self.root_dir) |
| 331 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 332 | options.verbose, |
| 333 | ['update', 'DEPS', '--ignore-externals'], |
| 334 | cwd=self.base_path, |
| 335 | file_list=files_list) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 336 | |
| 337 | # Now we fall back on scm.update(). |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 338 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 339 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
| 340 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 341 | gclient_scm.scm.SVN.CaptureInfo(dotted_path).AndReturn(file_info) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 342 | gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 343 | |
| 344 | self.mox.ReplayAll() |
| 345 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 346 | relpath=self.relpath) |
| 347 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 348 | self.checkstdout('\n_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 349 | |
| 350 | def testUpdateSingleCheckoutSVN14(self): |
| 351 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 352 | |
| 353 | # Checks to make sure that we support svn co --depth. |
| 354 | gclient_scm.scm.SVN.current_version = None |
| 355 | gclient_scm.scm.SVN.Capture(['--version'] |
| 356 | ).AndReturn('svn, version 1.4.4 (r25188)') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 357 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 358 | |
| 359 | # When checking out a single file with svn 1.4, we use svn export |
| 360 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 361 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 362 | ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')], |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 363 | always=True, cwd=self.root_dir) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 364 | |
| 365 | self.mox.ReplayAll() |
| 366 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 367 | relpath=self.relpath) |
| 368 | scm.updatesingle(options, ['DEPS'], files_list) |
| 369 | |
| 370 | def testUpdateSingleCheckoutSVNUpgrade(self): |
| 371 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 372 | file_info = { |
| 373 | 'URL': self.url, |
| 374 | 'Revision': 42, |
| 375 | } |
| 376 | |
| 377 | # Checks to make sure that we support svn co --depth. |
| 378 | gclient_scm.scm.SVN.current_version = None |
| 379 | gclient_scm.scm.SVN.Capture(['--version'] |
| 380 | ).AndReturn('svn, version 1.5.1 (r32289)') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 381 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 382 | # If DEPS already exists, assume we're upgrading from svn1.4, so delete |
| 383 | # the old DEPS file. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 384 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(True) |
| 385 | gclient_scm.os.remove(join(self.base_path, 'DEPS')) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 386 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 387 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 388 | gclient_scm.scm.SVN.CaptureStatus(join(self.base_path, '.')).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 389 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 390 | # When checking out a single file, we issue an svn checkout and svn update. |
| 391 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 392 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 393 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 394 | always=True, |
| 395 | cwd=self.root_dir) |
| 396 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 397 | options.verbose, |
| 398 | ['update', 'DEPS', '--ignore-externals'], |
| 399 | cwd=self.base_path, |
| 400 | file_list=files_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 401 | |
| 402 | # Now we fall back on scm.update(). |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 403 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 404 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
| 405 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 406 | gclient_scm.scm.SVN.CaptureInfo( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 407 | join(self.base_path, ".")).AndReturn(file_info) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 408 | gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 409 | |
| 410 | self.mox.ReplayAll() |
| 411 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 412 | relpath=self.relpath) |
| 413 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 414 | self.checkstdout( |
| 415 | ('\n_____ %s at 42\n' % self.relpath)) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 416 | |
| 417 | def testUpdateSingleUpdate(self): |
| 418 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 419 | file_info = { |
| 420 | 'URL': self.url, |
| 421 | 'Revision': 42, |
| 422 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 423 | # Checks to make sure that we support svn co --depth. |
| 424 | gclient_scm.scm.SVN.current_version = None |
| 425 | gclient_scm.scm.SVN.Capture(['--version'] |
| 426 | ).AndReturn('svn, version 1.5.1 (r32289)') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 427 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 428 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 429 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 430 | gclient_scm.scm.SVN.CaptureStatus(join(self.base_path, '.')).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 431 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 432 | # Now we fall back on scm.update(). |
| 433 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 434 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 435 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
| 436 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 437 | gclient_scm.scm.SVN.CaptureInfo( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 438 | join(self.base_path, '.')).AndReturn(file_info) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 439 | gclient_scm.scm.SVN.CaptureInfo(file_info['URL']).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 440 | |
| 441 | self.mox.ReplayAll() |
| 442 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 443 | relpath=self.relpath) |
| 444 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 445 | self.checkstdout('\n_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 446 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 447 | def testUpdateGit(self): |
| 448 | options = self.Options(verbose=True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 449 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git') |
| 450 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 451 | |
| 452 | self.mox.ReplayAll() |
| 453 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 454 | relpath=self.relpath) |
| 455 | file_list = [] |
| 456 | scm.update(options, self.args, file_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 457 | self.checkstdout( |
| 458 | ('________ found .git directory; skipping %s\n' % self.relpath)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 459 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 460 | def testUpdateHg(self): |
| 461 | options = self.Options(verbose=True) |
| 462 | gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False) |
| 463 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(True) |
| 464 | |
| 465 | self.mox.ReplayAll() |
| 466 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 467 | relpath=self.relpath) |
| 468 | file_list = [] |
| 469 | scm.update(options, self.args, file_list) |
| 470 | self.checkstdout( |
| 471 | ('________ found .hg directory; skipping %s\n' % self.relpath)) |
| 472 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 473 | |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 474 | class GitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 475 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 476 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 477 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 478 | def __init__(self, verbose=False, revision=None): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 479 | self.verbose = verbose |
| 480 | self.revision = revision |
| 481 | self.manually_grab_svn_rev = True |
| 482 | self.deps_os = None |
| 483 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 484 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 485 | self.nohooks = False |
| 486 | |
| 487 | sample_git_import = """blob |
| 488 | mark :1 |
| 489 | data 6 |
| 490 | Hello |
| 491 | |
| 492 | blob |
| 493 | mark :2 |
| 494 | data 4 |
| 495 | Bye |
| 496 | |
| 497 | reset refs/heads/master |
| 498 | commit refs/heads/master |
| 499 | mark :3 |
| 500 | author Bob <bob@example.com> 1253744361 -0700 |
| 501 | committer Bob <bob@example.com> 1253744361 -0700 |
| 502 | data 8 |
| 503 | A and B |
| 504 | M 100644 :1 a |
| 505 | M 100644 :2 b |
| 506 | |
| 507 | blob |
| 508 | mark :4 |
| 509 | data 10 |
| 510 | Hello |
| 511 | You |
| 512 | |
| 513 | blob |
| 514 | mark :5 |
| 515 | data 8 |
| 516 | Bye |
| 517 | You |
| 518 | |
| 519 | commit refs/heads/origin |
| 520 | mark :6 |
| 521 | author Alice <alice@example.com> 1253744424 -0700 |
| 522 | committer Alice <alice@example.com> 1253744424 -0700 |
| 523 | data 13 |
| 524 | Personalized |
| 525 | from :3 |
| 526 | M 100644 :4 a |
| 527 | M 100644 :5 b |
| 528 | |
| 529 | reset refs/heads/master |
| 530 | from :3 |
| 531 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 532 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 533 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 534 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 535 | @staticmethod |
| 536 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 537 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 538 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 539 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 540 | cwd=path).communicate() |
| 541 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 542 | # git is not available, skip this test. |
| 543 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 544 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 545 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 546 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 547 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 548 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 549 | stderr=STDOUT, cwd=path).communicate() |
| 550 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 551 | stderr=STDOUT, cwd=path).communicate() |
| 552 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
| 553 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 554 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 555 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 556 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 557 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 558 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 559 | TestCaseUtils.setUp(self) |
| 560 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 561 | self.url = 'git://foo' |
| 562 | self.root_dir = tempfile.mkdtemp() |
| 563 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 564 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 565 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 566 | StdoutCheck.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 567 | |
| 568 | def tearDown(self): |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 569 | StdoutCheck.tearDown(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 570 | TestCaseUtils.tearDown(self) |
| 571 | unittest.TestCase.tearDown(self) |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 572 | rmtree(self.root_dir) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 573 | |
| 574 | def testDir(self): |
| 575 | members = [ |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 576 | 'FullUrlForRelativeUrl', 'RunCommand', |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 577 | 'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert', |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 578 | 'revinfo', 'runhooks', 'status', 'update', 'url', |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 579 | ] |
| 580 | |
| 581 | # If you add a member, be sure to add the relevant test! |
| 582 | self.compareMembers(gclient_scm.CreateSCM(url=self.url), members) |
| 583 | |
| 584 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 585 | if not self.enabled: |
| 586 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 587 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 588 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 589 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 590 | relpath=self.relpath) |
| 591 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 592 | scm.update(options, None, file_list) |
| 593 | gclient_scm.os.remove(file_path) |
| 594 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 595 | scm.revert(options, self.args, file_list) |
| 596 | self.assertEquals(file_list, [file_path]) |
| 597 | file_list = [] |
| 598 | scm.diff(options, self.args, file_list) |
| 599 | self.assertEquals(file_list, []) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 600 | self.checkstdout( |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 601 | ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n' |
| 602 | 'Fast-forward\n a | 1 +\n b | 1 +\n' |
| 603 | ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 604 | '________ running \'git reset --hard origin/master\' in \'%s\'\n' |
| 605 | 'HEAD is now at a7142dc Personalized\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 606 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 607 | |
| 608 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 609 | if not self.enabled: |
| 610 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 611 | options = self.Options() |
| 612 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 613 | relpath=self.relpath) |
| 614 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 615 | scm.update(options, None, file_list) |
| 616 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 617 | scm.revert(options, self.args, file_list) |
| 618 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 619 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 620 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 621 | self.checkstdout( |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 622 | ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n' |
| 623 | 'Fast-forward\n a | 1 +\n b | 1 +\n' |
| 624 | ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 625 | '________ running \'git reset --hard origin/master\' in \'%s\'\n' |
| 626 | 'HEAD is now at a7142dc Personalized\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 627 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 628 | |
| 629 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 630 | if not self.enabled: |
| 631 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 632 | options = self.Options() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 633 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 634 | relpath=self.relpath) |
| 635 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 636 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 637 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 638 | open(file_path, 'a').writelines('touched\n') |
| 639 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 640 | scm.revert(options, self.args, file_list) |
| 641 | self.assertEquals(file_list, [file_path]) |
| 642 | file_list = [] |
| 643 | scm.diff(options, self.args, file_list) |
| 644 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 645 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 646 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 647 | self.checkstdout( |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 648 | ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n' |
| 649 | 'Fast-forward\n a | 1 +\n b | 1 +\n' |
| 650 | ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 651 | '________ running \'git reset --hard origin/master\' in \'%s\'\n' |
| 652 | 'HEAD is now at a7142dc Personalized\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 653 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 654 | |
| 655 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 656 | if not self.enabled: |
| 657 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 658 | options = self.Options() |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 659 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 660 | relpath=self.relpath) |
| 661 | file_list = [] |
| 662 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 663 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 664 | f = open(file_path, 'w') |
| 665 | f.writelines('new\n') |
| 666 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 667 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 668 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 669 | file_list = [] |
| 670 | scm.revert(options, self.args, file_list) |
| 671 | self.assertEquals(file_list, [file_path]) |
| 672 | file_list = [] |
| 673 | scm.diff(options, self.args, file_list) |
| 674 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 675 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 676 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 677 | self.checkstdout( |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 678 | ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n' |
| 679 | 'Fast-forward\n a | 1 +\n b | 1 +\n' |
| 680 | ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 681 | '________ running \'git reset --hard origin/master\' in \'%s\'\n' |
| 682 | 'HEAD is now at a7142dc Personalized\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 683 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 684 | |
| 685 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 686 | if not self.enabled: |
| 687 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 688 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 689 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 690 | open(file_path, 'a').writelines('touched\n') |
| 691 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 692 | relpath=self.relpath) |
| 693 | file_list = [] |
| 694 | scm.status(options, self.args, file_list) |
| 695 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 696 | self.checkstdout( |
| 697 | ('\n________ running \'git diff --name-status ' |
| 698 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 699 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 700 | |
| 701 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 702 | if not self.enabled: |
| 703 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 704 | options = self.Options() |
| 705 | expected_file_list = [] |
| 706 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 707 | file_path = join(self.base_path, f) |
| 708 | open(file_path, 'a').writelines('touched\n') |
| 709 | expected_file_list.extend([file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 710 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 711 | relpath=self.relpath) |
| 712 | file_list = [] |
| 713 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 714 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 715 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 716 | self.checkstdout( |
| 717 | ('\n________ running \'git diff --name-status ' |
| 718 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 719 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 720 | |
| 721 | def testUpdateCheckout(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 722 | if not self.enabled: |
| 723 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 724 | options = self.Options(verbose=True) |
| 725 | root_dir = tempfile.mkdtemp() |
| 726 | relpath = 'foo' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 727 | base_path = join(root_dir, relpath) |
| 728 | url = join(self.base_path, '.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 729 | try: |
| 730 | scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir, |
| 731 | relpath=relpath) |
| 732 | file_list = [] |
| 733 | scm.update(options, (), file_list) |
| 734 | self.assertEquals(len(file_list), 2) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 735 | self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a'))) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 736 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 737 | '069c602044c5388d2d15c3f875b057c852003458') |
| 738 | finally: |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 739 | rmtree(root_dir) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 740 | self.checkstdout( |
| 741 | ('\n_____ foo at refs/heads/master\n\n' |
| 742 | '________ running \'git clone -b master --verbose %s %s\' in \'%s\'\n' |
| 743 | 'Initialized empty Git repository in %s\n') % |
| 744 | (join(self.root_dir, '.', '.git'), join(root_dir, 'foo'), root_dir, |
bauerb@chromium.org | 4acf742 | 2010-10-07 14:20:08 +0000 | [diff] [blame] | 745 | join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 746 | |
| 747 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 748 | if not self.enabled: |
| 749 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 750 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 751 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 752 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 753 | relpath=self.relpath) |
| 754 | file_list = [] |
| 755 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 756 | self.assertEquals(file_list, expected_file_list) |
| 757 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 758 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 759 | self.checkstdout( |
| 760 | '\n_____ . at refs/heads/master\n' |
| 761 | 'Updating 069c602..a7142dc\nFast-forward\n a | 1 +\n b | 1 +\n' |
| 762 | ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 763 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 764 | def testUpdateUnstagedConflict(self): |
| 765 | if not self.enabled: |
| 766 | return |
| 767 | options = self.Options() |
| 768 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 769 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 770 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 771 | open(file_path, 'w').writelines('conflict\n') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 772 | exception = ( |
| 773 | "error: Your local changes to 'b' would be overwritten by merge. " |
| 774 | "Aborting.\n" |
| 775 | "Please, commit your changes or stash them before you can merge.\n") |
| 776 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 777 | self.checkstdout('\n_____ . at refs/heads/master\n') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 778 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 779 | def testUpdateConflict(self): |
| 780 | if not self.enabled: |
| 781 | return |
| 782 | options = self.Options() |
| 783 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 784 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 785 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 786 | open(file_path, 'w').writelines('conflict\n') |
| 787 | # pylint: disable=W0212 |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 788 | scm._Run(['commit', '-am', 'test'], options) |
| 789 | __builtin__.raw_input = lambda x: 'y' |
| 790 | exception = ('Conflict while rebasing this branch.\n' |
| 791 | 'Fix the conflict and run gclient again.\n' |
| 792 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 793 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 794 | exception = ('\n____ . at refs/heads/master\n' |
| 795 | '\tYou have unstaged changes.\n' |
| 796 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 797 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 798 | # The hash always changes. Use a cheap trick. |
| 799 | start = ('\n________ running \'git commit -am test\' in \'%s\'\n' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 800 | '[new ') % join(self.root_dir, '.') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 801 | end = ('] test\n 1 files changed, 1 insertions(+), ' |
| 802 | '1 deletions(-)\n\n_____ . at refs/heads/master\n' |
| 803 | 'Attempting rebase onto refs/remotes/origin/master...\n') |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 804 | self.assertTrue(sys.stdout.getvalue().startswith(start)) |
| 805 | self.assertTrue(sys.stdout.getvalue().endswith(end)) |
| 806 | self.assertEquals(len(sys.stdout.getvalue()), |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 807 | len(start) + len(end) + 7) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 808 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 809 | |
msb@chromium.org | e4af1ab | 2010-01-13 21:26:09 +0000 | [diff] [blame] | 810 | def testUpdateNotGit(self): |
| 811 | if not self.enabled: |
| 812 | return |
| 813 | options = self.Options() |
| 814 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 815 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 816 | git_path = join(self.base_path, '.git') |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 817 | rename(git_path, git_path + 'foo') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 818 | exception = ('\n____ . at refs/heads/master\n' |
| 819 | '\tPath is not a git repo. No .git dir.\n' |
| 820 | '\tTo resolve:\n' |
| 821 | '\t\trm -rf .\n' |
| 822 | '\tAnd run gclient sync again\n') |
msb@chromium.org | e4af1ab | 2010-01-13 21:26:09 +0000 | [diff] [blame] | 823 | self.assertRaisesError(exception, scm.update, options, (), []) |
| 824 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 825 | def testRevinfo(self): |
| 826 | if not self.enabled: |
| 827 | return |
| 828 | options = self.Options() |
| 829 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 830 | relpath=self.relpath) |
| 831 | rev_info = scm.revinfo(options, (), None) |
| 832 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 833 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 834 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 835 | if __name__ == '__main__': |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 836 | unittest.main() |
| 837 | |
| 838 | # vim: ts=2:sw=2:tw=80:et: |