123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344 |
- #!/usr/bin/env python
- # Copyright (c) 2012 The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- """Unit tests for gclient_scm.py."""
- # pylint: disable=E1103
- # Import before super_mox to keep valid references.
- from shutil import rmtree
- from subprocess import Popen, PIPE, STDOUT
- import json
- import logging
- import os
- import re
- import sys
- import tempfile
- import unittest
- if sys.version_info.major == 2:
- from cStringIO import StringIO
- else:
- from io import StringIO
- sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
- from third_party import mock
- from testing_support import fake_repos
- from testing_support import test_case_utils
- import gclient_scm
- import git_cache
- import subprocess2
- # Disable global git cache
- git_cache.Mirror.SetCachePath(None)
- # Shortcut since this function is used often
- join = gclient_scm.os.path.join
- TIMESTAMP_RE = re.compile('\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL)
- def strip_timestamps(value):
- lines = value.splitlines(True)
- for i in range(len(lines)):
- m = TIMESTAMP_RE.match(lines[i])
- if m:
- lines[i] = m.group(1)
- return ''.join(lines)
- class BasicTests(unittest.TestCase):
- @mock.patch('gclient_scm.scm.GIT.Capture')
- def testGetFirstRemoteUrl(self, mockCapture):
- REMOTE_STRINGS = [('remote.origin.url E:\\foo\\bar', 'E:\\foo\\bar'),
- ('remote.origin.url /b/foo/bar', '/b/foo/bar'),
- ('remote.origin.url https://foo/bar', 'https://foo/bar'),
- ('remote.origin.url E:\\Fo Bar\\bax', 'E:\\Fo Bar\\bax'),
- ('remote.origin.url git://what/"do', 'git://what/"do')]
- FAKE_PATH = '/fake/path'
- mockCapture.side_effect = [question for question, _ in REMOTE_STRINGS]
- for _, answer in REMOTE_STRINGS:
- self.assertEqual(
- gclient_scm.SCMWrapper._get_first_remote_url(FAKE_PATH), answer)
- expected_calls = [
- mock.call(['config', '--local', '--get-regexp', r'remote.*.url'],
- cwd=FAKE_PATH)
- for _ in REMOTE_STRINGS
- ]
- self.assertEqual(mockCapture.mock_calls, expected_calls)
- class BaseGitWrapperTestCase(unittest.TestCase, test_case_utils.TestCaseUtils):
- """This class doesn't use pymox."""
- class OptionsObject(object):
- def __init__(self, verbose=False, revision=None):
- self.auto_rebase = False
- self.verbose = verbose
- self.revision = revision
- self.deps_os = None
- self.force = False
- self.reset = False
- self.nohooks = False
- self.no_history = False
- self.upstream = False
- self.cache_dir = None
- self.merge = False
- self.jobs = 1
- self.break_repo_locks = False
- self.delete_unversioned_trees = False
- self.patch_ref = None
- self.patch_repo = None
- self.rebase_patch_ref = True
- self.reset_patch_ref = True
- sample_git_import = """blob
- mark :1
- data 6
- Hello
- blob
- mark :2
- data 4
- Bye
- reset refs/heads/master
- commit refs/heads/master
- mark :3
- author Bob <bob@example.com> 1253744361 -0700
- committer Bob <bob@example.com> 1253744361 -0700
- data 8
- A and B
- M 100644 :1 a
- M 100644 :2 b
- blob
- mark :4
- data 10
- Hello
- You
- blob
- mark :5
- data 8
- Bye
- You
- commit refs/heads/origin
- mark :6
- author Alice <alice@example.com> 1253744424 -0700
- committer Alice <alice@example.com> 1253744424 -0700
- data 13
- Personalized
- from :3
- M 100644 :4 a
- M 100644 :5 b
- blob
- mark :7
- data 5
- Mooh
- commit refs/heads/feature
- mark :8
- author Bob <bob@example.com> 1390311986 -0000
- committer Bob <bob@example.com> 1390311986 -0000
- data 6
- Add C
- from :3
- M 100644 :7 c
- reset refs/heads/master
- from :3
- """
- def Options(self, *args, **kwargs):
- return self.OptionsObject(*args, **kwargs)
- def checkstdout(self, expected):
- value = sys.stdout.getvalue()
- sys.stdout.close()
- # pylint: disable=no-member
- self.assertEqual(expected, strip_timestamps(value))
- @staticmethod
- def CreateGitRepo(git_import, path):
- """Do it for real."""
- try:
- Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT,
- cwd=path).communicate()
- except OSError:
- # git is not available, skip this test.
- return False
- Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate(input=git_import.encode())
- Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT,
- cwd=path).communicate()
- Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate()
- Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate()
- Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'],
- stdout=PIPE, stderr=STDOUT, cwd=path).communicate()
- Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate()
- Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate()
- Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE,
- stderr=STDOUT, cwd=path).communicate()
- return True
- def _GetAskForDataCallback(self, expected_prompt, return_value):
- def AskForData(prompt, options):
- self.assertEqual(prompt, expected_prompt)
- return return_value
- return AskForData
- def setUp(self):
- unittest.TestCase.setUp(self)
- test_case_utils.TestCaseUtils.setUp(self)
- self.url = 'git://foo'
- # The .git suffix allows gclient_scm to recognize the dir as a git repo
- # when cloning it locally
- self.root_dir = tempfile.mkdtemp('.git')
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
- self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists
- mock.patch('gclient_scm.GitWrapper.BinaryExists',
- staticmethod(lambda : True)).start()
- mock.patch('sys.stdout', StringIO()).start()
- self.addCleanup(mock.patch.stopall)
- self.addCleanup(lambda: rmtree(self.root_dir))
- class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
- def testRevertMissing(self):
- if not self.enabled:
- return
- options = self.Options()
- file_path = join(self.base_path, 'a')
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, None, file_list)
- gclient_scm.os.remove(file_path)
- file_list = []
- scm.revert(options, self.args, file_list)
- self.assertEqual(file_list, [file_path])
- file_list = []
- scm.diff(options, self.args, file_list)
- self.assertEqual(file_list, [])
- sys.stdout.close()
- def testRevertNone(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, None, file_list)
- file_list = []
- scm.revert(options, self.args, file_list)
- self.assertEqual(file_list, [])
- self.assertEqual(scm.revinfo(options, self.args, None),
- 'a7142dc9f0009350b96a11f372b6ea658592aa95')
- sys.stdout.close()
- def testRevertModified(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, None, file_list)
- file_path = join(self.base_path, 'a')
- with open(file_path, 'a') as f:
- f.writelines('touched\n')
- file_list = []
- scm.revert(options, self.args, file_list)
- self.assertEqual(file_list, [file_path])
- file_list = []
- scm.diff(options, self.args, file_list)
- self.assertEqual(file_list, [])
- self.assertEqual(scm.revinfo(options, self.args, None),
- 'a7142dc9f0009350b96a11f372b6ea658592aa95')
- sys.stdout.close()
- def testRevertNew(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, None, file_list)
- file_path = join(self.base_path, 'c')
- with open(file_path, 'w') as f:
- f.writelines('new\n')
- Popen(['git', 'add', 'c'], stdout=PIPE,
- stderr=STDOUT, cwd=self.base_path).communicate()
- file_list = []
- scm.revert(options, self.args, file_list)
- self.assertEqual(file_list, [file_path])
- file_list = []
- scm.diff(options, self.args, file_list)
- self.assertEqual(file_list, [])
- self.assertEqual(scm.revinfo(options, self.args, None),
- 'a7142dc9f0009350b96a11f372b6ea658592aa95')
- sys.stdout.close()
- def testStatusNew(self):
- if not self.enabled:
- return
- options = self.Options()
- file_path = join(self.base_path, 'a')
- with open(file_path, 'a') as f:
- f.writelines('touched\n')
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.status(options, self.args, file_list)
- self.assertEqual(file_list, [file_path])
- self.checkstdout(
- ('\n________ running \'git -c core.quotePath=false diff --name-status '
- '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\n') %
- join(self.root_dir, '.'))
- def testStatus2New(self):
- if not self.enabled:
- return
- options = self.Options()
- expected_file_list = []
- for f in ['a', 'b']:
- file_path = join(self.base_path, f)
- with open(file_path, 'a') as f:
- f.writelines('touched\n')
- expected_file_list.extend([file_path])
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.status(options, self.args, file_list)
- expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
- self.assertEqual(sorted(file_list), expected_file_list)
- self.checkstdout(
- ('\n________ running \'git -c core.quotePath=false diff --name-status '
- '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\nM\tb\n')
- % join(self.root_dir, '.'))
- def testUpdateUpdate(self):
- if not self.enabled:
- return
- options = self.Options()
- expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- 'a7142dc9f0009350b96a11f372b6ea658592aa95')
- sys.stdout.close()
- def testUpdateMerge(self):
- if not self.enabled:
- return
- options = self.Options()
- options.merge = True
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- scm._Run(['checkout', '-q', 'feature'], options)
- rev = scm.revinfo(options, (), None)
- file_list = []
- scm.update(options, (), file_list)
- self.assertEqual(file_list, [join(self.base_path, x)
- for x in ['a', 'b', 'c']])
- # The actual commit that is created is unstable, so we verify its tree and
- # parents instead.
- self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
- 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
- self.assertEqual(scm._Capture(['rev-parse', 'HEAD^1']), rev)
- self.assertEqual(scm._Capture(['rev-parse', 'HEAD^2']),
- scm._Capture(['rev-parse', 'origin/master']))
- sys.stdout.close()
- def testUpdateRebase(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- scm._Run(['checkout', '-q', 'feature'], options)
- file_list = []
- # Fake a 'y' key press.
- scm._AskForData = self._GetAskForDataCallback(
- 'Cannot fast-forward merge, attempt to rebase? '
- '(y)es / (q)uit / (s)kip : ', 'y')
- scm.update(options, (), file_list)
- self.assertEqual(file_list, [join(self.base_path, x)
- for x in ['a', 'b', 'c']])
- # The actual commit that is created is unstable, so we verify its tree and
- # parent instead.
- self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
- 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
- self.assertEqual(scm._Capture(['rev-parse', 'HEAD^']),
- scm._Capture(['rev-parse', 'origin/master']))
- sys.stdout.close()
- def testUpdateReset(self):
- if not self.enabled:
- return
- options = self.Options()
- options.reset = True
- dir_path = join(self.base_path, 'c')
- os.mkdir(dir_path)
- with open(join(dir_path, 'nested'), 'w') as f:
- f.writelines('new\n')
- file_path = join(self.base_path, 'file')
- with open(file_path, 'w') as f:
- f.writelines('new\n')
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, (), file_list)
- self.assert_(gclient_scm.os.path.isdir(dir_path))
- self.assert_(gclient_scm.os.path.isfile(file_path))
- sys.stdout.close()
- def testUpdateResetUnsetsFetchConfig(self):
- if not self.enabled:
- return
- options = self.Options()
- options.reset = True
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- scm._Run(['config', 'remote.origin.fetch',
- '+refs/heads/bad/ref:refs/remotes/origin/bad/ref'], options)
- file_list = []
- scm.update(options, (), file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '069c602044c5388d2d15c3f875b057c852003458')
- sys.stdout.close()
- def testUpdateResetDeleteUnversionedTrees(self):
- if not self.enabled:
- return
- options = self.Options()
- options.reset = True
- options.delete_unversioned_trees = True
- dir_path = join(self.base_path, 'dir')
- os.mkdir(dir_path)
- with open(join(dir_path, 'nested'), 'w') as f:
- f.writelines('new\n')
- file_path = join(self.base_path, 'file')
- with open(file_path, 'w') as f:
- f.writelines('new\n')
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- scm.update(options, (), file_list)
- self.assert_(not gclient_scm.os.path.isdir(dir_path))
- self.assert_(gclient_scm.os.path.isfile(file_path))
- sys.stdout.close()
- def testUpdateUnstagedConflict(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_path = join(self.base_path, 'b')
- with open(file_path, 'w') as f:
- f.writelines('conflict\n')
- try:
- scm.update(options, (), [])
- self.fail()
- except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError):
- # The exact exception text varies across git versions so it's not worth
- # verifying it. It's fine as long as it throws.
- pass
- # Manually flush stdout since we can't verify it's content accurately across
- # git versions.
- sys.stdout.getvalue()
- sys.stdout.close()
- @unittest.skip('Skipping until crbug.com/670884 is resolved.')
- def testUpdateLocked(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_path = join(self.base_path, '.git', 'index.lock')
- with open(file_path, 'w'):
- pass
- with self.assertRaises(subprocess2.CalledProcessError):
- scm.update(options, (), [])
- sys.stdout.close()
- def testUpdateLockedBreak(self):
- if not self.enabled:
- return
- options = self.Options()
- options.break_repo_locks = True
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_path = join(self.base_path, '.git', 'index.lock')
- with open(file_path, 'w'):
- pass
- scm.update(options, (), [])
- self.assertRegexpMatches(sys.stdout.getvalue(),
- "breaking lock.*\.git/index\.lock")
- self.assertFalse(os.path.exists(file_path))
- sys.stdout.close()
- def testUpdateConflict(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_path = join(self.base_path, 'b')
- with open(file_path, 'w') as f:
- f.writelines('conflict\n')
- scm._Run(['commit', '-am', 'test'], options)
- scm._AskForData = self._GetAskForDataCallback(
- 'Cannot fast-forward merge, attempt to rebase? '
- '(y)es / (q)uit / (s)kip : ', 'y')
- with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
- scm.update(options, (), [])
- self.assertEqual(
- e.exception.args[0],
- 'Conflict while rebasing this branch.\n'
- 'Fix the conflict and run gclient again.\n'
- 'See \'man git-rebase\' for details.\n')
- with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
- scm.update(options, (), [])
- self.assertEqual(
- e.exception.args[0],
- '\n____ . at refs/remotes/origin/master\n'
- '\tYou have unstaged changes.\n'
- '\tPlease commit, stash, or reset.\n')
- sys.stdout.close()
- def testRevinfo(self):
- if not self.enabled:
- return
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- rev_info = scm.revinfo(options, (), None)
- self.assertEqual(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
- def testMirrorPushUrl(self):
- if not self.enabled:
- return
- fakes = fake_repos.FakeRepos()
- fakes.set_up_git()
- self.url = fakes.git_base + 'repo_1'
- self.root_dir = fakes.root_dir
- self.addCleanup(fake_repos.FakeRepos.tear_down_git, fakes)
- mirror = tempfile.mkdtemp()
- self.addCleanup(rmtree, mirror)
- # This should never happen, but if it does, it'd render the other assertions
- # in this test meaningless.
- self.assertFalse(self.url.startswith(mirror))
- git_cache.Mirror.SetCachePath(mirror)
- self.addCleanup(git_cache.Mirror.SetCachePath, None)
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, self.relpath)
- self.assertIsNotNone(scm._GetMirror(self.url, options))
- scm.update(options, (), [])
- fetch_url = scm._Capture(['remote', 'get-url', 'origin'])
- self.assertTrue(
- fetch_url.startswith(mirror),
- msg='\n'.join([
- 'Repository fetch url should be in the git cache mirror directory.',
- ' fetch_url: %s' % fetch_url,
- ' mirror: %s' % mirror]))
- push_url = scm._Capture(['remote', 'get-url', '--push', 'origin'])
- self.assertEqual(push_url, self.url)
- sys.stdout.close()
- class ManagedGitWrapperTestCaseMock(unittest.TestCase):
- class OptionsObject(object):
- def __init__(self, verbose=False, revision=None, force=False):
- self.verbose = verbose
- self.revision = revision
- self.deps_os = None
- self.force = force
- self.reset = False
- self.nohooks = False
- self.break_repo_locks = False
- # TODO(maruel): Test --jobs > 1.
- self.jobs = 1
- self.patch_ref = None
- self.patch_repo = None
- self.rebase_patch_ref = True
- def Options(self, *args, **kwargs):
- return self.OptionsObject(*args, **kwargs)
- def checkstdout(self, expected):
- value = sys.stdout.getvalue()
- sys.stdout.close()
- # pylint: disable=no-member
- self.assertEqual(expected, strip_timestamps(value))
- def setUp(self):
- self.fake_hash_1 = 't0ta11yf4k3'
- self.fake_hash_2 = '3v3nf4k3r'
- self.url = 'git://foo'
- self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp'
- self.relpath = 'fake'
- self.base_path = os.path.join(self.root_dir, self.relpath)
- self.backup_base_path = os.path.join(self.root_dir,
- 'old_%s.git' % self.relpath)
- mock.patch('gclient_scm.scm.GIT.ApplyEnvVars').start()
- mock.patch('gclient_scm.GitWrapper._CheckMinVersion').start()
- mock.patch('gclient_scm.GitWrapper._Fetch').start()
- mock.patch('gclient_scm.GitWrapper._DeleteOrMove').start()
- mock.patch('sys.stdout', StringIO()).start()
- self.addCleanup(mock.patch.stopall)
- @mock.patch('scm.GIT.IsValidRevision')
- @mock.patch('os.path.isdir', lambda _: True)
- def testGetUsableRevGit(self, mockIsValidRevision):
- # pylint: disable=no-member
- options = self.Options(verbose=True)
- mockIsValidRevision.side_effect = lambda cwd, rev: rev != '1'
- git_scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- # A [fake] git sha1 with a git repo should work (this is in the case that
- # the LKGR gets flipped to git sha1's some day).
- self.assertEqual(git_scm.GetUsableRev(self.fake_hash_1, options),
- self.fake_hash_1)
- # An SVN rev with an existing purely git repo should raise an exception.
- self.assertRaises(gclient_scm.gclient_utils.Error,
- git_scm.GetUsableRev, '1', options)
- @mock.patch('gclient_scm.GitWrapper._Clone')
- @mock.patch('os.path.isdir')
- @mock.patch('os.path.exists')
- @mock.patch('subprocess2.check_output')
- def testUpdateNoDotGit(
- self, mockCheckOutput, mockExists, mockIsdir, mockClone):
- mockIsdir.side_effect = lambda path: path == self.base_path
- mockExists.side_effect = lambda path: path == self.base_path
- mockCheckOutput.return_value = b''
- options = self.Options()
- scm = gclient_scm.GitWrapper(
- self.url, self.root_dir, self.relpath)
- scm.update(options, None, [])
- env = gclient_scm.scm.GIT.ApplyEnvVars({})
- self.assertEqual(
- mockCheckOutput.mock_calls,
- [
- mock.call(
- ['git', '-c', 'core.quotePath=false', 'ls-files'],
- cwd=self.base_path, env=env, stderr=-1),
- mock.call(
- ['git', 'rev-parse', '--verify', 'HEAD'],
- cwd=self.base_path, env=env, stderr=-1),
- ])
- mockClone.assert_called_with(
- 'refs/remotes/origin/master', self.url, options)
- self.checkstdout('\n')
- @mock.patch('gclient_scm.GitWrapper._Clone')
- @mock.patch('os.path.isdir')
- @mock.patch('os.path.exists')
- @mock.patch('subprocess2.check_output')
- def testUpdateConflict(
- self, mockCheckOutput, mockExists, mockIsdir, mockClone):
- mockIsdir.side_effect = lambda path: path == self.base_path
- mockExists.side_effect = lambda path: path == self.base_path
- mockCheckOutput.return_value = b''
- mockClone.side_effect = [
- gclient_scm.subprocess2.CalledProcessError(
- None, None, None, None, None),
- None,
- ]
- options = self.Options()
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- scm.update(options, None, [])
- env = gclient_scm.scm.GIT.ApplyEnvVars({})
- self.assertEqual(
- mockCheckOutput.mock_calls,
- [
- mock.call(
- ['git', '-c', 'core.quotePath=false', 'ls-files'],
- cwd=self.base_path, env=env, stderr=-1),
- mock.call(
- ['git', 'rev-parse', '--verify', 'HEAD'],
- cwd=self.base_path, env=env, stderr=-1),
- ])
- mockClone.assert_called_with(
- 'refs/remotes/origin/master', self.url, options)
- self.checkstdout('\n')
- class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
- def checkInStdout(self, expected):
- value = sys.stdout.getvalue()
- sys.stdout.close()
- # pylint: disable=no-member
- self.assertIn(expected, value)
- def checkNotInStdout(self, expected):
- value = sys.stdout.getvalue()
- sys.stdout.close()
- # pylint: disable=no-member
- self.assertNotIn(expected, value)
- def getCurrentBranch(self):
- # Returns name of current branch or HEAD for detached HEAD
- branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'],
- cwd=self.base_path)
- if branch == 'HEAD':
- return None
- return branch
- def testUpdateClone(self):
- if not self.enabled:
- return
- options = self.Options()
- origin_root_dir = self.root_dir
- self.root_dir = tempfile.mkdtemp()
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- scm = gclient_scm.GitWrapper(origin_root_dir,
- self.root_dir,
- self.relpath)
- expected_file_list = [join(self.base_path, "a"),
- join(self.base_path, "b")]
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '069c602044c5388d2d15c3f875b057c852003458')
- # indicates detached HEAD
- self.assertEqual(self.getCurrentBranch(), None)
- self.checkInStdout(
- 'Checked out refs/remotes/origin/master to a detached HEAD')
- rmtree(origin_root_dir)
- def testUpdateCloneOnCommit(self):
- if not self.enabled:
- return
- options = self.Options()
- origin_root_dir = self.root_dir
- self.root_dir = tempfile.mkdtemp()
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- url_with_commit_ref = origin_root_dir +\
- '@a7142dc9f0009350b96a11f372b6ea658592aa95'
- scm = gclient_scm.GitWrapper(url_with_commit_ref,
- self.root_dir,
- self.relpath)
- expected_file_list = [join(self.base_path, "a"),
- join(self.base_path, "b")]
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- 'a7142dc9f0009350b96a11f372b6ea658592aa95')
- # indicates detached HEAD
- self.assertEqual(self.getCurrentBranch(), None)
- self.checkInStdout(
- 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD')
- rmtree(origin_root_dir)
- def testUpdateCloneOnBranch(self):
- if not self.enabled:
- return
- options = self.Options()
- origin_root_dir = self.root_dir
- self.root_dir = tempfile.mkdtemp()
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- url_with_branch_ref = origin_root_dir + '@feature'
- scm = gclient_scm.GitWrapper(url_with_branch_ref,
- self.root_dir,
- self.relpath)
- expected_file_list = [join(self.base_path, "a"),
- join(self.base_path, "b"),
- join(self.base_path, "c")]
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '9a51244740b25fa2ded5252ca00a3178d3f665a9')
- # indicates detached HEAD
- self.assertEqual(self.getCurrentBranch(), None)
- self.checkInStdout(
- 'Checked out 9a51244740b25fa2ded5252ca00a3178d3f665a9 '
- 'to a detached HEAD')
- rmtree(origin_root_dir)
- def testUpdateCloneOnFetchedRemoteBranch(self):
- if not self.enabled:
- return
- options = self.Options()
- origin_root_dir = self.root_dir
- self.root_dir = tempfile.mkdtemp()
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature'
- scm = gclient_scm.GitWrapper(url_with_branch_ref,
- self.root_dir,
- self.relpath)
- expected_file_list = [join(self.base_path, "a"),
- join(self.base_path, "b"),
- join(self.base_path, "c")]
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '9a51244740b25fa2ded5252ca00a3178d3f665a9')
- # indicates detached HEAD
- self.assertEqual(self.getCurrentBranch(), None)
- self.checkInStdout(
- 'Checked out refs/remotes/origin/feature to a detached HEAD')
- rmtree(origin_root_dir)
- def testUpdateCloneOnTrueRemoteBranch(self):
- if not self.enabled:
- return
- options = self.Options()
- origin_root_dir = self.root_dir
- self.root_dir = tempfile.mkdtemp()
- self.relpath = '.'
- self.base_path = join(self.root_dir, self.relpath)
- url_with_branch_ref = origin_root_dir + '@refs/heads/feature'
- scm = gclient_scm.GitWrapper(url_with_branch_ref,
- self.root_dir,
- self.relpath)
- expected_file_list = [join(self.base_path, "a"),
- join(self.base_path, "b"),
- join(self.base_path, "c")]
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '9a51244740b25fa2ded5252ca00a3178d3f665a9')
- # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so
- # should be treated as such by gclient.
- # TODO(mmoss): Though really, we should only allow DEPS to specify branches
- # as they are known in the upstream repo, since the mapping into the local
- # repo can be modified by users (or we might even want to change the gclient
- # defaults at some point). But that will take more work to stop using
- # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will
- # always resolve locally, like when passing them to show-ref or rev-list).
- self.assertEqual(self.getCurrentBranch(), None)
- self.checkInStdout(
- 'Checked out refs/remotes/origin/feature to a detached HEAD')
- rmtree(origin_root_dir)
- def testUpdateUpdate(self):
- if not self.enabled:
- return
- options = self.Options()
- expected_file_list = []
- scm = gclient_scm.GitWrapper(self.url, self.root_dir,
- self.relpath)
- file_list = []
- options.revision = 'unmanaged'
- scm.update(options, (), file_list)
- self.assertEqual(file_list, expected_file_list)
- self.assertEqual(scm.revinfo(options, (), None),
- '069c602044c5388d2d15c3f875b057c852003458')
- self.checkstdout('________ unmanaged solution; skipping .\n')
- class CipdWrapperTestCase(unittest.TestCase):
- def setUp(self):
- # Create this before setting up mocks.
- self._cipd_root_dir = tempfile.mkdtemp()
- self._workdir = tempfile.mkdtemp()
- self._cipd_instance_url = 'https://chrome-infra-packages.appspot.com'
- self._cipd_root = gclient_scm.CipdRoot(
- self._cipd_root_dir,
- self._cipd_instance_url)
- self._cipd_packages = [
- self._cipd_root.add_package('f', 'foo_package', 'foo_version'),
- self._cipd_root.add_package('b', 'bar_package', 'bar_version'),
- self._cipd_root.add_package('b', 'baz_package', 'baz_version'),
- ]
- mock.patch('tempfile.mkdtemp', lambda: self._workdir).start()
- mock.patch('gclient_scm.CipdRoot.add_package').start()
- mock.patch('gclient_scm.CipdRoot.clobber').start()
- mock.patch('gclient_scm.CipdRoot.ensure').start()
- self.addCleanup(mock.patch.stopall)
- def tearDown(self):
- rmtree(self._cipd_root_dir)
- rmtree(self._workdir)
- def createScmWithPackageThatSatisfies(self, condition):
- return gclient_scm.CipdWrapper(
- url=self._cipd_instance_url,
- root_dir=self._cipd_root_dir,
- relpath='fake_relpath',
- root=self._cipd_root,
- package=self.getPackageThatSatisfies(condition))
- def getPackageThatSatisfies(self, condition):
- for p in self._cipd_packages:
- if condition(p):
- return p
- self.fail('Unable to find a satisfactory package.')
- def testRevert(self):
- """Checks that revert does nothing."""
- scm = self.createScmWithPackageThatSatisfies(lambda _: True)
- scm.revert(None, (), [])
- @mock.patch('gclient_scm.gclient_utils.CheckCallAndFilter')
- @mock.patch('gclient_scm.gclient_utils.rmtree')
- def testRevinfo(self, mockRmtree, mockCheckCallAndFilter):
- """Checks that revinfo uses the JSON from cipd describe."""
- scm = self.createScmWithPackageThatSatisfies(lambda _: True)
- expected_revinfo = '0123456789abcdef0123456789abcdef01234567'
- json_contents = {
- 'result': {
- 'pin': {
- 'instance_id': expected_revinfo,
- }
- }
- }
- describe_json_path = join(self._workdir, 'describe.json')
- with open(describe_json_path, 'w') as describe_json:
- json.dump(json_contents, describe_json)
- revinfo = scm.revinfo(None, (), [])
- self.assertEqual(revinfo, expected_revinfo)
- mockRmtree.assert_called_with(self._workdir)
- mockCheckCallAndFilter.assert_called_with([
- 'cipd', 'describe', 'foo_package',
- '-log-level', 'error',
- '-version', 'foo_version',
- '-json-output', describe_json_path,
- ])
- def testUpdate(self):
- """Checks that update does nothing."""
- scm = self.createScmWithPackageThatSatisfies(lambda _: True)
- scm.update(None, (), [])
- class GerritChangesFakeRepo(fake_repos.FakeReposBase):
- def populateGit(self):
- # Creates a tree that looks like this:
- #
- # 6 refs/changes/35/1235/1
- # |
- # 5 refs/changes/34/1234/1
- # |
- # 1--2--3--4 refs/heads/master
- # | |
- # | 11(5)--12 refs/heads/master-with-5
- # |
- # 7--8--9 refs/heads/feature
- # |
- # 10 refs/changes/36/1236/1
- #
- self._commit_git('repo_1', {'commit 1': 'touched'})
- self._commit_git('repo_1', {'commit 2': 'touched'})
- self._commit_git('repo_1', {'commit 3': 'touched'})
- self._commit_git('repo_1', {'commit 4': 'touched'})
- self._create_ref('repo_1', 'refs/heads/master', 4)
- # Create a change on top of commit 3 that consists of two commits.
- self._commit_git('repo_1',
- {'commit 5': 'touched',
- 'change': '1234'},
- base=3)
- self._create_ref('repo_1', 'refs/changes/34/1234/1', 5)
- self._commit_git('repo_1',
- {'commit 6': 'touched',
- 'change': '1235'})
- self._create_ref('repo_1', 'refs/changes/35/1235/1', 6)
- # Create a refs/heads/feature branch on top of commit 2, consisting of three
- # commits.
- self._commit_git('repo_1', {'commit 7': 'touched'}, base=2)
- self._commit_git('repo_1', {'commit 8': 'touched'})
- self._commit_git('repo_1', {'commit 9': 'touched'})
- self._create_ref('repo_1', 'refs/heads/feature', 9)
- # Create a change of top of commit 8.
- self._commit_git('repo_1',
- {'commit 10': 'touched',
- 'change': '1236'},
- base=8)
- self._create_ref('repo_1', 'refs/changes/36/1236/1', 10)
- # Create a refs/heads/master-with-5 on top of commit 3 which is a branch
- # where refs/changes/34/1234/1 (commit 5) has already landed as commit 11.
- self._commit_git('repo_1',
- # This is really commit 11, but has the changes of commit 5
- {'commit 5': 'touched',
- 'change': '1234'},
- base=3)
- self._commit_git('repo_1', {'commit 12': 'touched'})
- self._create_ref('repo_1', 'refs/heads/master-with-5', 12)
- class GerritChangesTest(fake_repos.FakeReposTestBase):
- FAKE_REPOS_CLASS = GerritChangesFakeRepo
- def setUp(self):
- super(GerritChangesTest, self).setUp()
- self.enabled = self.FAKE_REPOS.set_up_git()
- self.options = BaseGitWrapperTestCase.OptionsObject()
- self.url = self.git_base + 'repo_1'
- self.mirror = None
- def setUpMirror(self):
- self.mirror = tempfile.mkdtemp()
- git_cache.Mirror.SetCachePath(self.mirror)
- self.addCleanup(rmtree, self.mirror)
- self.addCleanup(git_cache.Mirror.SetCachePath, None)
- def assertCommits(self, commits):
- """Check that all, and only |commits| are present in the current checkout.
- """
- for i in commits:
- name = os.path.join(self.root_dir, 'commit ' + str(i))
- self.assertTrue(os.path.exists(name), 'Commit not found: %s' % name)
- all_commits = set(range(1, len(self.FAKE_REPOS.git_hashes['repo_1'])))
- for i in all_commits - set(commits):
- name = os.path.join(self.root_dir, 'commit ' + str(i))
- self.assertFalse(os.path.exists(name), 'Unexpected commit: %s' % name)
- def testCanCloneGerritChange(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.revision = 'refs/changes/35/1235/1'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
- def testCanSyncToGerritChange(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.revision = self.githash('repo_1', 1)
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
- self.options.revision = 'refs/changes/35/1235/1'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
- def testCanCloneGerritChangeMirror(self):
- self.setUpMirror()
- self.testCanCloneGerritChange()
- def testCanSyncToGerritChangeMirror(self):
- self.setUpMirror()
- self.testCanSyncToGerritChange()
- def testAppliesPatchOnTopOfMasterByDefault(self):
- """Test the default case, where we apply a patch on top of master."""
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Make sure we don't specify a revision.
- self.options.revision = None
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 4, 5, 6])
- self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
- def testCheckoutOlderThanPatchBase(self):
- """Test applying a patch on an old checkout.
- We first checkout commit 1, and try to patch refs/changes/35/1235/1, which
- contains commits 5 and 6, and is based on top of commit 3.
- The final result should contain commits 1, 5 and 6, but not commits 2 or 3.
- """
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Sync to commit 1
- self.options.revision = self.githash('repo_1', 1)
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
- # Apply the change on top of that.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 5, 6])
- self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
- def testCheckoutOriginFeature(self):
- """Tests that we can apply a patch on a branch other than master."""
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Sync to remote's refs/heads/feature
- self.options.revision = 'refs/heads/feature'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
- # Apply the change on top of that.
- scm.apply_patch_ref(
- self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
- file_list)
- self.assertCommits([1, 2, 7, 8, 9, 10])
- self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
- def testCheckoutOriginFeatureOnOldRevision(self):
- """Tests that we can apply a patch on an old checkout, on a branch other
- than master."""
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Sync to remote's refs/heads/feature on an old revision
- self.options.revision = self.githash('repo_1', 7)
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
- # Apply the change on top of that.
- scm.apply_patch_ref(
- self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
- file_list)
- # We shouldn't have rebased on top of 2 (which is the merge base between
- # remote's master branch and the change) but on top of 7 (which is the
- # merge base between remote's feature branch and the change).
- self.assertCommits([1, 2, 7, 10])
- self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
- def testCheckoutOriginFeaturePatchBranch(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Sync to the hash instead of remote's refs/heads/feature.
- self.options.revision = self.githash('repo_1', 9)
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
- # Apply refs/changes/34/1234/1, created for remote's master branch on top of
- # remote's feature branch.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- # Commits 5 and 6 are part of the patch, and commits 1, 2, 7, 8 and 9 are
- # part of remote's feature branch.
- self.assertCommits([1, 2, 5, 6, 7, 8, 9])
- self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
- def testDoesntRebasePatchMaster(self):
- """Tests that we can apply a patch without rebasing it.
- """
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.rebase_patch_ref = False
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
- # Apply the change on top of that.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 5, 6])
- self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
- def testDoesntRebasePatchOldCheckout(self):
- """Tests that we can apply a patch without rebasing it on an old checkout.
- """
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- # Sync to commit 1
- self.options.revision = self.githash('repo_1', 1)
- self.options.rebase_patch_ref = False
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
- # Apply the change on top of that.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 5, 6])
- self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
- def testDoesntSoftResetIfNotAskedTo(self):
- """Test that we can apply a patch without doing a soft reset."""
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.reset_patch_ref = False
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 4, 5, 6])
- # The commit hash after cherry-picking is not known, but it must be
- # different from what the repo was synced at before patching.
- self.assertNotEqual(self.githash('repo_1', 4),
- self.gitrevparse(self.root_dir))
- def testRecoversAfterPatchFailure(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.revision = 'refs/changes/34/1234/1'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
- # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
- # patch 'refs/changes/36/1236/1' creates a patch failure.
- with self.assertRaises(subprocess2.CalledProcessError) as cm:
- scm.apply_patch_ref(
- self.url, 'refs/changes/36/1236/1', 'refs/heads/master', self.options,
- file_list)
- self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
- self.assertIn(b'error: could not apply', cm.exception.stderr)
- # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
- # conflict.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 5, 6])
- self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
- def testIgnoresAlreadyMergedCommits(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.revision = 'refs/heads/master-with-5'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 12),
- self.gitrevparse(self.root_dir))
- # When we try 'refs/changes/35/1235/1' on top of 'refs/heads/feature',
- # 'refs/changes/34/1234/1' will be an empty commit, since the changes were
- # already present in the tree as commit 11.
- # Make sure we deal with this gracefully.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/feature', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 5, 6, 12])
- self.assertEqual(self.githash('repo_1', 12),
- self.gitrevparse(self.root_dir))
- def testRecoversFromExistingCherryPick(self):
- scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
- file_list = []
- self.options.revision = 'refs/changes/34/1234/1'
- scm.update(self.options, None, file_list)
- self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
- # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
- # cherry-pick 'refs/changes/36/1236/1' raises an error.
- scm._Run(['fetch', 'origin', 'refs/changes/36/1236/1'], self.options)
- with self.assertRaises(subprocess2.CalledProcessError) as cm:
- scm._Run(['cherry-pick', 'FETCH_HEAD'], self.options)
- self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
- # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
- # conflict.
- scm.apply_patch_ref(
- self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
- file_list)
- self.assertCommits([1, 2, 3, 5, 6])
- self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
- if __name__ == '__main__':
- level = logging.DEBUG if '-v' in sys.argv else logging.FATAL
- logging.basicConfig(
- level=level,
- format='%(asctime).19s %(levelname)s %(filename)s:'
- '%(lineno)s %(message)s')
- unittest.main()
- # vim: ts=2:sw=2:tw=80:et:
|