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