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