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