git_cl_test.py 121 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553255425552556255725582559256025612562256325642565256625672568256925702571257225732574257525762577257825792580258125822583258425852586258725882589259025912592259325942595259625972598259926002601260226032604260526062607260826092610261126122613261426152616261726182619262026212622262326242625262626272628262926302631263226332634263526362637263826392640264126422643264426452646264726482649265026512652265326542655265626572658265926602661266226632664266526662667266826692670267126722673267426752676267726782679268026812682268326842685268626872688268926902691269226932694269526962697269826992700270127022703270427052706270727082709271027112712271327142715271627172718271927202721272227232724272527262727272827292730273127322733273427352736273727382739274027412742274327442745274627472748274927502751275227532754275527562757275827592760276127622763276427652766276727682769277027712772277327742775277627772778277927802781278227832784278527862787278827892790279127922793279427952796279727982799280028012802280328042805280628072808280928102811281228132814281528162817281828192820282128222823282428252826282728282829283028312832283328342835283628372838283928402841284228432844284528462847284828492850285128522853285428552856285728582859286028612862286328642865286628672868286928702871287228732874287528762877287828792880288128822883288428852886288728882889289028912892289328942895289628972898289929002901290229032904290529062907290829092910291129122913291429152916291729182919292029212922292329242925292629272928292929302931293229332934293529362937293829392940294129422943294429452946294729482949295029512952295329542955295629572958295929602961296229632964296529662967296829692970297129722973297429752976297729782979298029812982298329842985298629872988298929902991299229932994299529962997299829993000300130023003300430053006300730083009301030113012301330143015301630173018301930203021302230233024302530263027302830293030303130323033303430353036303730383039304030413042304330443045304630473048304930503051305230533054305530563057305830593060306130623063306430653066306730683069307030713072307330743075307630773078307930803081308230833084308530863087308830893090309130923093309430953096309730983099310031013102310331043105310631073108310931103111311231133114311531163117311831193120312131223123312431253126312731283129313031313132313331343135313631373138313931403141314231433144314531463147314831493150315131523153315431553156315731583159316031613162316331643165316631673168316931703171317231733174317531763177317831793180318131823183318431853186318731883189319031913192319331943195319631973198319932003201320232033204320532063207320832093210321132123213321432153216321732183219322032213222322332243225322632273228322932303231323232333234323532363237323832393240324132423243324432453246324732483249325032513252325332543255325632573258325932603261326232633264326532663267326832693270327132723273327432753276327732783279328032813282328332843285328632873288328932903291329232933294329532963297329832993300330133023303330433053306330733083309331033113312331333143315331633173318331933203321332233233324332533263327332833293330333133323333333433353336333733383339334033413342334333443345334633473348334933503351335233533354335533563357335833593360336133623363336433653366336733683369337033713372337333743375337633773378337933803381338233833384338533863387338833893390
  1. #!/usr/bin/env vpython3
  2. # coding=utf-8
  3. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
  4. # Use of this source code is governed by a BSD-style license that can be
  5. # found in the LICENSE file.
  6. """Unit tests for git_cl.py."""
  7. from __future__ import print_function
  8. from __future__ import unicode_literals
  9. import datetime
  10. import json
  11. import logging
  12. import os
  13. import pprint
  14. import shutil
  15. import sys
  16. import tempfile
  17. import unittest
  18. if sys.version_info.major == 2:
  19. from StringIO import StringIO
  20. import mock
  21. else:
  22. from io import StringIO
  23. from unittest import mock
  24. sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
  25. import metrics
  26. # We have to disable monitoring before importing git_cl.
  27. metrics.DISABLE_METRICS_COLLECTION = True
  28. import clang_format
  29. import gerrit_util
  30. import git_cl
  31. import git_common
  32. import git_footers
  33. import git_new_branch
  34. import scm
  35. import subprocess2
  36. def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
  37. return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
  38. def _constantFn(return_value):
  39. def f(*args, **kwargs):
  40. return return_value
  41. return f
  42. CERR1 = callError(1)
  43. def MakeNamedTemporaryFileMock(test, expected_content):
  44. class NamedTemporaryFileMock(object):
  45. def __init__(self, *args, **kwargs):
  46. self.name = '/tmp/named'
  47. self.expected_content = expected_content.encode('utf-8', 'replace')
  48. def __enter__(self):
  49. return self
  50. def __exit__(self, _type, _value, _tb):
  51. pass
  52. def write(self, content):
  53. if self.expected_content:
  54. test.assertEqual(self.expected_content, content)
  55. def close(self):
  56. pass
  57. return NamedTemporaryFileMock
  58. class ChangelistMock(object):
  59. # A class variable so we can access it when we don't have access to the
  60. # instance that's being set.
  61. desc = ''
  62. def __init__(self, **kwargs):
  63. pass
  64. def GetIssue(self):
  65. return 1
  66. def FetchDescription(self):
  67. return ChangelistMock.desc
  68. def UpdateDescription(self, desc, force=False):
  69. ChangelistMock.desc = desc
  70. class PresubmitMock(object):
  71. def __init__(self, *args, **kwargs):
  72. self.reviewers = []
  73. self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
  74. @staticmethod
  75. def should_continue():
  76. return True
  77. class GitMocks(object):
  78. def __init__(self, config=None, branchref=None):
  79. self.branchref = branchref or 'refs/heads/master'
  80. self.config = config or {}
  81. def GetBranchRef(self, _root):
  82. return self.branchref
  83. def NewBranch(self, branchref):
  84. self.branchref = branchref
  85. def GetConfig(self, root, key, default=None):
  86. if root != '':
  87. key = '%s:%s' % (root, key)
  88. return self.config.get(key, default)
  89. def SetConfig(self, root, key, value=None):
  90. if root != '':
  91. key = '%s:%s' % (root, key)
  92. if value:
  93. self.config[key] = value
  94. return
  95. if key not in self.config:
  96. raise CERR1
  97. del self.config[key]
  98. class WatchlistsMock(object):
  99. def __init__(self, _):
  100. pass
  101. @staticmethod
  102. def GetWatchersForPaths(_):
  103. return ['joe@example.com']
  104. class CodereviewSettingsFileMock(object):
  105. def __init__(self):
  106. pass
  107. # pylint: disable=no-self-use
  108. def read(self):
  109. return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
  110. 'GERRIT_HOST: True\n')
  111. class AuthenticatorMock(object):
  112. def __init__(self, *_args):
  113. pass
  114. def has_cached_credentials(self):
  115. return True
  116. def authorize(self, http):
  117. return http
  118. def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
  119. """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
  120. Usage:
  121. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  122. CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
  123. OR
  124. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  125. CookiesAuthenticatorMockFactory(
  126. same_auth=('user', '', 'pass'))
  127. """
  128. class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
  129. def __init__(self): # pylint: disable=super-init-not-called
  130. # Intentionally not calling super() because it reads actual cookie files.
  131. pass
  132. @classmethod
  133. def get_gitcookies_path(cls):
  134. return '~/.gitcookies'
  135. @classmethod
  136. def get_netrc_path(cls):
  137. return '~/.netrc'
  138. def _get_auth_for_host(self, host):
  139. if same_auth:
  140. return same_auth
  141. return (hosts_with_creds or {}).get(host)
  142. return CookiesAuthenticatorMock
  143. class MockChangelistWithBranchAndIssue():
  144. def __init__(self, branch, issue):
  145. self.branch = branch
  146. self.issue = issue
  147. def GetBranch(self):
  148. return self.branch
  149. def GetIssue(self):
  150. return self.issue
  151. class SystemExitMock(Exception):
  152. pass
  153. class TestGitClBasic(unittest.TestCase):
  154. def test_fetch_description(self):
  155. cl = git_cl.Changelist(issue=1, codereview_host='host')
  156. cl.description = 'x'
  157. cl.has_description = True
  158. self.assertEqual(cl.FetchDescription(), 'x')
  159. def test_set_preserve_tryjobs(self):
  160. d = git_cl.ChangeDescription('Simple.')
  161. d.set_preserve_tryjobs()
  162. self.assertEqual(d.description.splitlines(), [
  163. 'Simple.',
  164. '',
  165. 'Cq-Do-Not-Cancel-Tryjobs: true',
  166. ])
  167. before = d.description
  168. d.set_preserve_tryjobs()
  169. self.assertEqual(before, d.description)
  170. d = git_cl.ChangeDescription('\n'.join([
  171. 'One is enough',
  172. '',
  173. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  174. 'Change-Id: Ideadbeef',
  175. ]))
  176. d.set_preserve_tryjobs()
  177. self.assertEqual(d.description.splitlines(), [
  178. 'One is enough',
  179. '',
  180. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  181. 'Change-Id: Ideadbeef',
  182. 'Cq-Do-Not-Cancel-Tryjobs: true',
  183. ])
  184. def test_get_bug_line_values(self):
  185. f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
  186. self.assertEqual(f('', ''), [])
  187. self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
  188. self.assertEqual(f('v8', '456'), ['v8:456'])
  189. self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  190. # Not nice, but not worth carying.
  191. self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
  192. ['v8:456', 'chromium:123', 'v8:123'])
  193. def _test_git_number(self, parent_msg, dest_ref, child_msg,
  194. parent_hash='parenthash'):
  195. desc = git_cl.ChangeDescription(child_msg)
  196. desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
  197. return desc.description
  198. def assertEqualByLine(self, actual, expected):
  199. self.assertEqual(actual.splitlines(), expected.splitlines())
  200. def test_git_number_bad_parent(self):
  201. with self.assertRaises(ValueError):
  202. self._test_git_number('Parent', 'refs/heads/master', 'Child')
  203. def test_git_number_bad_parent_footer(self):
  204. with self.assertRaises(AssertionError):
  205. self._test_git_number(
  206. 'Parent\n'
  207. '\n'
  208. 'Cr-Commit-Position: wrong',
  209. 'refs/heads/master', 'Child')
  210. def test_git_number_bad_lineage_ignored(self):
  211. actual = self._test_git_number(
  212. 'Parent\n'
  213. '\n'
  214. 'Cr-Commit-Position: refs/heads/master@{#1}\n'
  215. 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
  216. 'refs/heads/master', 'Child')
  217. self.assertEqualByLine(
  218. actual,
  219. 'Child\n'
  220. '\n'
  221. 'Cr-Commit-Position: refs/heads/master@{#2}\n'
  222. 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
  223. def test_git_number_same_branch(self):
  224. actual = self._test_git_number(
  225. 'Parent\n'
  226. '\n'
  227. 'Cr-Commit-Position: refs/heads/master@{#12}',
  228. dest_ref='refs/heads/master',
  229. child_msg='Child')
  230. self.assertEqualByLine(
  231. actual,
  232. 'Child\n'
  233. '\n'
  234. 'Cr-Commit-Position: refs/heads/master@{#13}')
  235. def test_git_number_same_branch_mixed_footers(self):
  236. actual = self._test_git_number(
  237. 'Parent\n'
  238. '\n'
  239. 'Cr-Commit-Position: refs/heads/master@{#12}',
  240. dest_ref='refs/heads/master',
  241. child_msg='Child\n'
  242. '\n'
  243. 'Broken-by: design\n'
  244. 'BUG=123')
  245. self.assertEqualByLine(
  246. actual,
  247. 'Child\n'
  248. '\n'
  249. 'Broken-by: design\n'
  250. 'BUG=123\n'
  251. 'Cr-Commit-Position: refs/heads/master@{#13}')
  252. def test_git_number_same_branch_with_originals(self):
  253. actual = self._test_git_number(
  254. 'Parent\n'
  255. '\n'
  256. 'Cr-Commit-Position: refs/heads/master@{#12}',
  257. dest_ref='refs/heads/master',
  258. child_msg='Child\n'
  259. '\n'
  260. 'Some users are smart and insert their own footers\n'
  261. '\n'
  262. 'Cr-Whatever: value\n'
  263. 'Cr-Commit-Position: refs/copy/paste@{#22}')
  264. self.assertEqualByLine(
  265. actual,
  266. 'Child\n'
  267. '\n'
  268. 'Some users are smart and insert their own footers\n'
  269. '\n'
  270. 'Cr-Original-Whatever: value\n'
  271. 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
  272. 'Cr-Commit-Position: refs/heads/master@{#13}')
  273. def test_git_number_new_branch(self):
  274. actual = self._test_git_number(
  275. 'Parent\n'
  276. '\n'
  277. 'Cr-Commit-Position: refs/heads/master@{#12}',
  278. dest_ref='refs/heads/branch',
  279. child_msg='Child')
  280. self.assertEqualByLine(
  281. actual,
  282. 'Child\n'
  283. '\n'
  284. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  285. 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
  286. def test_git_number_lineage(self):
  287. actual = self._test_git_number(
  288. 'Parent\n'
  289. '\n'
  290. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  291. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  292. dest_ref='refs/heads/branch',
  293. child_msg='Child')
  294. self.assertEqualByLine(
  295. actual,
  296. 'Child\n'
  297. '\n'
  298. 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
  299. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  300. def test_git_number_moooooooore_lineage(self):
  301. actual = self._test_git_number(
  302. 'Parent\n'
  303. '\n'
  304. 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
  305. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  306. dest_ref='refs/heads/mooore',
  307. child_msg='Child')
  308. self.assertEqualByLine(
  309. actual,
  310. 'Child\n'
  311. '\n'
  312. 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
  313. 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
  314. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  315. def test_git_number_ever_moooooooore_lineage(self):
  316. self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
  317. actual = self._test_git_number(
  318. 'CQ commit on fresh new branch + numbering.\n'
  319. '\n'
  320. 'NOTRY=True\n'
  321. 'NOPRESUBMIT=True\n'
  322. 'BUG=\n'
  323. '\n'
  324. 'Review-Url: https://codereview.chromium.org/2577703003\n'
  325. 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
  326. 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
  327. 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
  328. dest_ref='refs/heads/gnumb-test/cl',
  329. child_msg='git cl on fresh new branch + numbering.\n'
  330. '\n'
  331. 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
  332. self.assertEqualByLine(
  333. actual,
  334. 'git cl on fresh new branch + numbering.\n'
  335. '\n'
  336. 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
  337. 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
  338. 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
  339. 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
  340. 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
  341. def test_git_number_cherry_pick(self):
  342. actual = self._test_git_number(
  343. 'Parent\n'
  344. '\n'
  345. 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
  346. 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
  347. dest_ref='refs/heads/branch',
  348. child_msg='Child, which is cherry-pick from master\n'
  349. '\n'
  350. 'Cr-Commit-Position: refs/heads/master@{#100}\n'
  351. '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
  352. self.assertEqualByLine(
  353. actual,
  354. 'Child, which is cherry-pick from master\n'
  355. '\n'
  356. '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
  357. '\n'
  358. 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
  359. 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
  360. 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
  361. @mock.patch('gerrit_util.GetAccountDetails')
  362. def test_valid_accounts(self, mockGetAccountDetails):
  363. mock_per_account = {
  364. 'u1': None, # 404, doesn't exist.
  365. 'u2': {
  366. '_account_id': 123124,
  367. 'avatars': [],
  368. 'email': 'u2@example.com',
  369. 'name': 'User Number 2',
  370. 'status': 'OOO',
  371. },
  372. 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
  373. }
  374. def GetAccountDetailsMock(_, account):
  375. # Poor-man's mock library's side_effect.
  376. v = mock_per_account.pop(account)
  377. if isinstance(v, Exception):
  378. raise v
  379. return v
  380. mockGetAccountDetails.side_effect = GetAccountDetailsMock
  381. actual = git_cl.gerrit_util.ValidAccounts(
  382. 'host', ['u1', 'u2', 'u3'], max_threads=1)
  383. self.assertEqual(actual, {
  384. 'u2': {
  385. '_account_id': 123124,
  386. 'avatars': [],
  387. 'email': 'u2@example.com',
  388. 'name': 'User Number 2',
  389. 'status': 'OOO',
  390. },
  391. })
  392. class TestParseIssueURL(unittest.TestCase):
  393. def _validate(self, parsed, issue=None, patchset=None, hostname=None,
  394. fail=False):
  395. self.assertIsNotNone(parsed)
  396. if fail:
  397. self.assertFalse(parsed.valid)
  398. return
  399. self.assertTrue(parsed.valid)
  400. self.assertEqual(parsed.issue, issue)
  401. self.assertEqual(parsed.patchset, patchset)
  402. self.assertEqual(parsed.hostname, hostname)
  403. def test_ParseIssueNumberArgument(self):
  404. def test(arg, *args, **kwargs):
  405. self._validate(git_cl.ParseIssueNumberArgument(arg), *args, **kwargs)
  406. test('123', 123)
  407. test('', fail=True)
  408. test('abc', fail=True)
  409. test('123/1', fail=True)
  410. test('123a', fail=True)
  411. test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
  412. test('https://codereview.source.com/123',
  413. 123, None, 'codereview.source.com')
  414. test('http://chrome-review.source.com/c/123',
  415. 123, None, 'chrome-review.source.com')
  416. test('https://chrome-review.source.com/c/123/',
  417. 123, None, 'chrome-review.source.com')
  418. test('https://chrome-review.source.com/c/123/4',
  419. 123, 4, 'chrome-review.source.com')
  420. test('https://chrome-review.source.com/#/c/123/4',
  421. 123, 4, 'chrome-review.source.com')
  422. test('https://chrome-review.source.com/c/123/4',
  423. 123, 4, 'chrome-review.source.com')
  424. test('https://chrome-review.source.com/123',
  425. 123, None, 'chrome-review.source.com')
  426. test('https://chrome-review.source.com/123/4',
  427. 123, 4, 'chrome-review.source.com')
  428. test('https://chrome-review.source.com/bad/123/4', fail=True)
  429. test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
  430. test('https://chrome-review.source.com/c/abc/', fail=True)
  431. test('ssh://chrome-review.source.com/c/123/1/', fail=True)
  432. class GitCookiesCheckerTest(unittest.TestCase):
  433. def setUp(self):
  434. super(GitCookiesCheckerTest, self).setUp()
  435. self.c = git_cl._GitCookiesChecker()
  436. self.c._all_hosts = []
  437. mock.patch('sys.stdout', StringIO()).start()
  438. self.addCleanup(mock.patch.stopall)
  439. def mock_hosts_creds(self, subhost_identity_pairs):
  440. def ensure_googlesource(h):
  441. if not h.endswith(self.c._GOOGLESOURCE):
  442. assert not h.endswith('.')
  443. return h + '.' + self.c._GOOGLESOURCE
  444. return h
  445. self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
  446. for h, i in subhost_identity_pairs]
  447. def test_identity_parsing(self):
  448. self.assertEqual(self.c._parse_identity('ldap.google.com'),
  449. ('ldap', 'google.com'))
  450. self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
  451. ('ldap', 'example.com'))
  452. # Specical case because we know there are no subdomains in chromium.org.
  453. self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
  454. ('note.period', 'chromium.org'))
  455. # Pathological: ".period." can be either username OR domain, more likely
  456. # domain.
  457. self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
  458. ('note', 'period.example.com'))
  459. def test_analysis_nothing(self):
  460. self.c._all_hosts = []
  461. self.assertFalse(self.c.has_generic_host())
  462. self.assertEqual(set(), self.c.get_conflicting_hosts())
  463. self.assertEqual(set(), self.c.get_duplicated_hosts())
  464. self.assertEqual(set(), self.c.get_partially_configured_hosts())
  465. self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
  466. def test_analysis(self):
  467. self.mock_hosts_creds([
  468. ('.googlesource.com', 'git-example.chromium.org'),
  469. ('chromium', 'git-example.google.com'),
  470. ('chromium-review', 'git-example.google.com'),
  471. ('chrome-internal', 'git-example.chromium.org'),
  472. ('chrome-internal-review', 'git-example.chromium.org'),
  473. ('conflict', 'git-example.google.com'),
  474. ('conflict-review', 'git-example.chromium.org'),
  475. ('dup', 'git-example.google.com'),
  476. ('dup', 'git-example.google.com'),
  477. ('dup-review', 'git-example.google.com'),
  478. ('partial', 'git-example.google.com'),
  479. ('gpartial-review', 'git-example.google.com'),
  480. ])
  481. self.assertTrue(self.c.has_generic_host())
  482. self.assertEqual(set(['conflict.googlesource.com']),
  483. self.c.get_conflicting_hosts())
  484. self.assertEqual(set(['dup.googlesource.com']),
  485. self.c.get_duplicated_hosts())
  486. self.assertEqual(set(['partial.googlesource.com',
  487. 'gpartial-review.googlesource.com']),
  488. self.c.get_partially_configured_hosts())
  489. self.assertEqual(set(['chromium.googlesource.com',
  490. 'chrome-internal.googlesource.com']),
  491. self.c.get_hosts_with_wrong_identities())
  492. def test_report_no_problems(self):
  493. self.test_analysis_nothing()
  494. self.assertFalse(self.c.find_and_report_problems())
  495. self.assertEqual(sys.stdout.getvalue(), '')
  496. @mock.patch(
  497. 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
  498. return_value='~/.gitcookies')
  499. def test_report(self, *_mocks):
  500. self.test_analysis()
  501. self.assertTrue(self.c.find_and_report_problems())
  502. with open(os.path.join(os.path.dirname(__file__),
  503. 'git_cl_creds_check_report.txt')) as f:
  504. expected = f.read()
  505. def by_line(text):
  506. return [l.rstrip() for l in text.rstrip().splitlines()]
  507. self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
  508. self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
  509. class TestGitCl(unittest.TestCase):
  510. def setUp(self):
  511. super(TestGitCl, self).setUp()
  512. self.calls = []
  513. self._calls_done = []
  514. mock.patch('sys.stdout', StringIO()).start()
  515. mock.patch(
  516. 'git_cl.time_time',
  517. lambda: self._mocked_call('time.time')).start()
  518. mock.patch(
  519. 'git_cl.metrics.collector.add_repeated',
  520. lambda *a: self._mocked_call('add_repeated', *a)).start()
  521. mock.patch('subprocess2.call', self._mocked_call).start()
  522. mock.patch('subprocess2.check_call', self._mocked_call).start()
  523. mock.patch('subprocess2.check_output', self._mocked_call).start()
  524. mock.patch(
  525. 'subprocess2.communicate',
  526. lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
  527. mock.patch(
  528. 'git_cl.gclient_utils.CheckCallAndFilter',
  529. self._mocked_call).start()
  530. mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
  531. mock.patch(
  532. 'git_common.get_or_create_merge_base',
  533. lambda *a: self._mocked_call('get_or_create_merge_base', *a)).start()
  534. mock.patch('git_cl.BranchExists', return_value=True).start()
  535. mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
  536. mock.patch(
  537. 'git_cl.SaveDescriptionBackup',
  538. lambda _: self._mocked_call('SaveDescriptionBackup')).start()
  539. mock.patch(
  540. 'git_cl.ask_for_data',
  541. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  542. mock.patch(
  543. 'git_cl.write_json',
  544. lambda *a: self._mocked_call('write_json', *a)).start()
  545. mock.patch(
  546. 'git_cl.presubmit_support.DoPresubmitChecks', PresubmitMock).start()
  547. mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
  548. mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
  549. mock.patch('gerrit_util.GetChangeDetail').start()
  550. mock.patch(
  551. 'git_cl.gerrit_util.GetChangeComments',
  552. lambda *a: self._mocked_call('GetChangeComments', *a)).start()
  553. mock.patch(
  554. 'git_cl.gerrit_util.GetChangeRobotComments',
  555. lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
  556. mock.patch(
  557. 'git_cl.gerrit_util.AddReviewers',
  558. lambda *a: self._mocked_call('AddReviewers', *a)).start()
  559. mock.patch(
  560. 'git_cl.gerrit_util.SetReview',
  561. lambda h, i, msg=None, labels=None, notify=None, ready=None: (
  562. self._mocked_call(
  563. 'SetReview', h, i, msg, labels, notify, ready))).start()
  564. mock.patch(
  565. 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
  566. return_value=False).start()
  567. mock.patch(
  568. 'git_cl.gerrit_util.GceAuthenticator.is_gce',
  569. return_value=False).start()
  570. mock.patch(
  571. 'git_cl.gerrit_util.ValidAccounts',
  572. lambda *a: self._mocked_call('ValidAccounts', *a)).start()
  573. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  574. mock.patch('git_cl.Settings.GetRoot', return_value='').start()
  575. self.mockGit = GitMocks()
  576. mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
  577. mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
  578. mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
  579. mock.patch(
  580. 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
  581. mock.patch(
  582. 'scm.GIT.FetchUpstreamTuple',
  583. return_value=('origin', 'refs/heads/master')).start()
  584. mock.patch(
  585. 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
  586. # It's important to reset settings to not have inter-tests interference.
  587. git_cl.settings = None
  588. self.addCleanup(mock.patch.stopall)
  589. def tearDown(self):
  590. try:
  591. self.assertEqual([], self.calls)
  592. except AssertionError:
  593. calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
  594. if len(self.calls) > 5:
  595. calls += ' ...\n'
  596. self.fail(
  597. '\n'
  598. 'There are un-consumed calls after this test has finished:\n' +
  599. calls)
  600. finally:
  601. super(TestGitCl, self).tearDown()
  602. def _mocked_call(self, *args, **_kwargs):
  603. self.assertTrue(
  604. self.calls,
  605. '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
  606. top = self.calls.pop(0)
  607. expected_args, result = top
  608. # Also logs otherwise it could get caught in a try/finally and be hard to
  609. # diagnose.
  610. if expected_args != args:
  611. N = 5
  612. prior_calls = '\n '.join(
  613. '@%d: %r' % (len(self._calls_done) - N + i, c[0])
  614. for i, c in enumerate(self._calls_done[-N:]))
  615. following_calls = '\n '.join(
  616. '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
  617. for i, c in enumerate(self.calls[:N]))
  618. extended_msg = (
  619. 'A few prior calls:\n %s\n\n'
  620. 'This (expected):\n @%d: %r\n'
  621. 'This (actual):\n @%d: %r\n\n'
  622. 'A few following expected calls:\n %s' %
  623. (prior_calls, len(self._calls_done), expected_args,
  624. len(self._calls_done), args, following_calls))
  625. self.fail('@%d\n'
  626. ' Expected: %r\n'
  627. ' Actual: %r\n'
  628. '\n'
  629. '%s' % (
  630. len(self._calls_done), expected_args, args, extended_msg))
  631. self._calls_done.append(top)
  632. if isinstance(result, Exception):
  633. raise result
  634. # stdout from git commands is supposed to be a bytestream. Convert it here
  635. # instead of converting all test output in this file to bytes.
  636. if args[0][0] == 'git' and not isinstance(result, bytes):
  637. result = result.encode('utf-8')
  638. return result
  639. def test_ask_for_explicit_yes_true(self):
  640. self.calls = [
  641. (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
  642. (('ask_for_data', 'Please, type yes or no: '), 'ye'),
  643. ]
  644. self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
  645. def test_LoadCodereviewSettingsFromFile_gerrit(self):
  646. codereview_file = StringIO('GERRIT_HOST: true')
  647. self.calls = [
  648. ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
  649. ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
  650. ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
  651. ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
  652. ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
  653. ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
  654. CERR1),
  655. ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
  656. CERR1),
  657. ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
  658. CERR1),
  659. ((['git', 'config', 'gerrit.host', 'true'],), ''),
  660. ]
  661. self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
  662. @classmethod
  663. def _gerrit_base_calls(cls, issue=None, fetched_description=None,
  664. fetched_status=None, other_cl_owner=None,
  665. custom_cl_base=None, short_hostname='chromium',
  666. change_id=None):
  667. calls = []
  668. if custom_cl_base:
  669. ancestor_revision = custom_cl_base
  670. else:
  671. # Determine ancestor_revision to be merge base.
  672. ancestor_revision = 'fake_ancestor_sha'
  673. calls += [
  674. (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
  675. ancestor_revision),
  676. ]
  677. if issue:
  678. gerrit_util.GetChangeDetail.return_value = {
  679. 'owner': {'email': (other_cl_owner or 'owner@example.com')},
  680. 'change_id': (change_id or '123456789'),
  681. 'current_revision': 'sha1_of_current_revision',
  682. 'revisions': {'sha1_of_current_revision': {
  683. 'commit': {'message': fetched_description},
  684. }},
  685. 'status': fetched_status or 'NEW',
  686. }
  687. if fetched_status == 'ABANDONED':
  688. return calls
  689. if other_cl_owner:
  690. calls += [
  691. (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
  692. ]
  693. calls += [
  694. ((['git', 'rev-parse', 'HEAD'],), '12345'),
  695. ]
  696. if not issue:
  697. calls += [
  698. ((['git', 'log', '--pretty=format:%s%n%n%b',
  699. ancestor_revision + '...'],),
  700. 'foo'),
  701. ]
  702. calls += [
  703. ((['git', 'config', 'user.email'],), 'me@example.com'),
  704. (('time.time',), 1000,),
  705. (('time.time',), 3000,),
  706. (('add_repeated', 'sub_commands', {
  707. 'execution_time': 2000,
  708. 'command': 'presubmit',
  709. 'exit_code': 0
  710. }), None,),
  711. ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
  712. ([custom_cl_base] if custom_cl_base else
  713. [ancestor_revision, 'HEAD']),),
  714. '+dat'),
  715. ]
  716. return calls
  717. def _gerrit_upload_calls(self, description, reviewers, squash,
  718. squash_mode='default',
  719. expected_upstream_ref='origin/refs/heads/master',
  720. title=None, notify=False,
  721. post_amend_description=None, issue=None, cc=None,
  722. custom_cl_base=None, tbr=None,
  723. short_hostname='chromium',
  724. labels=None, change_id=None, original_title=None,
  725. final_description=None, gitcookies_exists=True,
  726. force=False, edit_description=None):
  727. if post_amend_description is None:
  728. post_amend_description = description
  729. cc = cc or []
  730. # Determined in `_gerrit_base_calls`.
  731. determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
  732. calls = []
  733. if squash_mode in ('override_squash', 'override_nosquash'):
  734. self.mockGit.config['gerrit.override-squash-uploads'] = (
  735. 'true' if squash_mode == 'override_squash' else 'false')
  736. # If issue is given, then description is fetched from Gerrit instead.
  737. if issue is None:
  738. calls += [
  739. ((['git', 'log', '--pretty=format:%s\n\n%b',
  740. ((custom_cl_base + '..') if custom_cl_base else
  741. 'fake_ancestor_sha..HEAD')],),
  742. description),
  743. ]
  744. if squash:
  745. title = 'Initial_upload'
  746. else:
  747. if not title:
  748. calls += [
  749. ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
  750. (('ask_for_data', 'Title for patchset []: '), 'User input'),
  751. ]
  752. title = 'User_input'
  753. if not git_footers.get_footer_change_id(description) and not squash:
  754. calls += [
  755. (('DownloadGerritHook', False), ''),
  756. # Amending of commit message to get the Change-Id.
  757. ((['git', 'log', '--pretty=format:%s\n\n%b',
  758. determined_ancestor_revision + '..HEAD'],),
  759. description),
  760. ((['git', 'commit', '--amend', '-m', description],), ''),
  761. ((['git', 'log', '--pretty=format:%s\n\n%b',
  762. determined_ancestor_revision + '..HEAD'],),
  763. post_amend_description)
  764. ]
  765. if squash:
  766. if force or not issue:
  767. if not force:
  768. calls += [
  769. ((['RunEditor'],), description),
  770. ]
  771. # user wants to edit description
  772. if edit_description:
  773. calls += [
  774. ((['RunEditor'],), edit_description),
  775. ]
  776. ref_to_push = 'abcdef0123456789'
  777. calls += [
  778. ]
  779. if custom_cl_base is None:
  780. calls += [
  781. (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
  782. 'origin/master'),
  783. ]
  784. parent = 'origin/master'
  785. else:
  786. calls += [
  787. ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
  788. 'refs/remotes/origin/master'],),
  789. callError(1)), # Means not ancenstor.
  790. (('ask_for_data',
  791. 'Do you take responsibility for cleaning up potential mess '
  792. 'resulting from proceeding with upload? Press Enter to upload, '
  793. 'or Ctrl+C to abort'), ''),
  794. ]
  795. parent = custom_cl_base
  796. calls += [
  797. ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
  798. '0123456789abcdef'),
  799. ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
  800. '-F', '/tmp/named'],),
  801. ref_to_push),
  802. ]
  803. else:
  804. ref_to_push = 'HEAD'
  805. calls += [
  806. (('SaveDescriptionBackup',), None),
  807. ((['git', 'rev-list',
  808. (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
  809. ref_to_push],),
  810. '1hashPerLine\n'),
  811. ]
  812. metrics_arguments = []
  813. if notify:
  814. ref_suffix = '%ready,notify=ALL'
  815. metrics_arguments += ['ready', 'notify=ALL']
  816. else:
  817. if not issue and squash:
  818. ref_suffix = '%wip'
  819. metrics_arguments.append('wip')
  820. else:
  821. ref_suffix = '%notify=NONE'
  822. metrics_arguments.append('notify=NONE')
  823. if title:
  824. ref_suffix += ',m=' + title
  825. metrics_arguments.append('m')
  826. if short_hostname == 'chromium':
  827. # All reviwers and ccs get into ref_suffix.
  828. for r in sorted(reviewers):
  829. ref_suffix += ',r=%s' % r
  830. metrics_arguments.append('r')
  831. if issue is None:
  832. cc += ['chromium-reviews+test-more-cc@chromium.org', 'joe@example.com']
  833. for c in sorted(cc):
  834. ref_suffix += ',cc=%s' % c
  835. metrics_arguments.append('cc')
  836. reviewers, cc = [], []
  837. else:
  838. # TODO(crbug/877717): remove this case.
  839. calls += [
  840. (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
  841. sorted(reviewers) + ['joe@example.com',
  842. 'chromium-reviews+test-more-cc@chromium.org'] + cc),
  843. {
  844. e: {'email': e}
  845. for e in (reviewers + ['joe@example.com'] + cc)
  846. })
  847. ]
  848. for r in sorted(reviewers):
  849. if r != 'bad-account-or-email':
  850. ref_suffix += ',r=%s' % r
  851. metrics_arguments.append('r')
  852. reviewers.remove(r)
  853. if issue is None:
  854. cc += ['joe@example.com']
  855. for c in sorted(cc):
  856. ref_suffix += ',cc=%s' % c
  857. metrics_arguments.append('cc')
  858. if c in cc:
  859. cc.remove(c)
  860. for k, v in sorted((labels or {}).items()):
  861. ref_suffix += ',l=%s+%d' % (k, v)
  862. metrics_arguments.append('l=%s+%d' % (k, v))
  863. if tbr:
  864. calls += [
  865. (('GetCodeReviewTbrScore',
  866. '%s-review.googlesource.com' % short_hostname,
  867. 'my/repo'),
  868. 2,),
  869. ]
  870. calls += [
  871. (('time.time',), 1000,),
  872. ((['git', 'push',
  873. 'https://%s.googlesource.com/my/repo' % short_hostname,
  874. ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
  875. (('remote:\n'
  876. 'remote: Processing changes: (\)\n'
  877. 'remote: Processing changes: (|)\n'
  878. 'remote: Processing changes: (/)\n'
  879. 'remote: Processing changes: (-)\n'
  880. 'remote: Processing changes: new: 1 (/)\n'
  881. 'remote: Processing changes: new: 1, done\n'
  882. 'remote:\n'
  883. 'remote: New Changes:\n'
  884. 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
  885. ' XXX\n'
  886. 'remote:\n'
  887. 'To https://%s.googlesource.com/my/repo\n'
  888. ' * [new branch] hhhh -> refs/for/refs/heads/master\n'
  889. ) % (short_hostname, short_hostname)),),
  890. (('time.time',), 2000,),
  891. (('add_repeated',
  892. 'sub_commands',
  893. {
  894. 'execution_time': 1000,
  895. 'command': 'git push',
  896. 'exit_code': 0,
  897. 'arguments': sorted(metrics_arguments),
  898. }),
  899. None,),
  900. ]
  901. final_description = final_description or post_amend_description.strip()
  902. original_title = original_title or title or '<untitled>'
  903. # Trace-related calls
  904. calls += [
  905. # Write a description with context for the current trace.
  906. ((['FileWrite', 'TRACES_DIR/20170316T200041.000000-README',
  907. 'Thu Mar 16 20:00:41 2017\n'
  908. '%(short_hostname)s-review.googlesource.com\n'
  909. '%(change_id)s\n'
  910. '%(title)s\n'
  911. '%(description)s\n'
  912. '1000\n'
  913. '0\n'
  914. '%(trace_name)s' % {
  915. 'short_hostname': short_hostname,
  916. 'change_id': change_id,
  917. 'description': final_description,
  918. 'title': original_title,
  919. 'trace_name': 'TRACES_DIR/20170316T200041.000000',
  920. }],),
  921. None,
  922. ),
  923. # Read traces and shorten git hashes.
  924. ((['os.path.isfile', 'TEMP_DIR/trace-packet'],),
  925. True,
  926. ),
  927. ((['FileRead', 'TEMP_DIR/trace-packet'],),
  928. ('git-hash: 0123456789012345678901234567890123456789\n'
  929. 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
  930. ),
  931. ((['FileWrite', 'TEMP_DIR/trace-packet',
  932. 'git-hash: 012345\n'
  933. 'git-hash: abcdea\n'],),
  934. None,
  935. ),
  936. # Make zip file for the git traces.
  937. ((['make_archive', 'TRACES_DIR/20170316T200041.000000-traces', 'zip',
  938. 'TEMP_DIR'],),
  939. None,
  940. ),
  941. # Collect git config and gitcookies.
  942. ((['git', 'config', '-l'],),
  943. 'git-config-output',
  944. ),
  945. ((['FileWrite', 'TEMP_DIR/git-config', 'git-config-output'],),
  946. None,
  947. ),
  948. ((['os.path.isfile', '~/.gitcookies'],),
  949. gitcookies_exists,
  950. ),
  951. ]
  952. if gitcookies_exists:
  953. calls += [
  954. ((['FileRead', '~/.gitcookies'],),
  955. 'gitcookies 1/SECRET',
  956. ),
  957. ((['FileWrite', 'TEMP_DIR/gitcookies', 'gitcookies REDACTED'],),
  958. None,
  959. ),
  960. ]
  961. calls += [
  962. # Make zip file for the git config and gitcookies.
  963. ((['make_archive', 'TRACES_DIR/20170316T200041.000000-git-info', 'zip',
  964. 'TEMP_DIR'],),
  965. None,
  966. ),
  967. ]
  968. # TODO(crbug/877717): this should never be used.
  969. if squash and short_hostname != 'chromium':
  970. calls += [
  971. (('AddReviewers',
  972. 'chromium-review.googlesource.com', 'my%2Frepo~123456',
  973. sorted(reviewers),
  974. cc + ['chromium-reviews+test-more-cc@chromium.org'],
  975. notify),
  976. ''),
  977. ]
  978. calls += [
  979. ((['git', 'rev-parse', 'HEAD'],), 'hash'),
  980. ]
  981. return calls
  982. def _run_gerrit_upload_test(
  983. self,
  984. upload_args,
  985. description,
  986. reviewers=None,
  987. squash=True,
  988. squash_mode=None,
  989. expected_upstream_ref='origin/refs/heads/master',
  990. title=None,
  991. notify=False,
  992. post_amend_description=None,
  993. issue=None,
  994. cc=None,
  995. fetched_status=None,
  996. other_cl_owner=None,
  997. custom_cl_base=None,
  998. tbr=None,
  999. short_hostname='chromium',
  1000. labels=None,
  1001. change_id=None,
  1002. original_title=None,
  1003. final_description=None,
  1004. gitcookies_exists=True,
  1005. force=False,
  1006. edit_description=None,
  1007. fetched_description=None):
  1008. """Generic gerrit upload test framework."""
  1009. if squash_mode is None:
  1010. if '--no-squash' in upload_args:
  1011. squash_mode = 'nosquash'
  1012. elif '--squash' in upload_args:
  1013. squash_mode = 'squash'
  1014. else:
  1015. squash_mode = 'default'
  1016. reviewers = reviewers or []
  1017. cc = cc or []
  1018. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  1019. CookiesAuthenticatorMockFactory(
  1020. same_auth=('git-owner.example.com', '', 'pass'))).start()
  1021. mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
  1022. lambda _, offer_removal: None).start()
  1023. mock.patch('git_cl.gclient_utils.RunEditor',
  1024. lambda *_, **__: self._mocked_call(['RunEditor'])).start()
  1025. mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
  1026. 'DownloadGerritHook', force)).start()
  1027. mock.patch('git_cl.gclient_utils.FileRead',
  1028. lambda path: self._mocked_call(['FileRead', path])).start()
  1029. mock.patch('git_cl.gclient_utils.FileWrite',
  1030. lambda path, contents: self._mocked_call(
  1031. ['FileWrite', path, contents])).start()
  1032. mock.patch('git_cl.datetime_now',
  1033. lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
  1034. mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
  1035. mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
  1036. mock.patch('git_cl.TRACES_README_FORMAT',
  1037. '%(now)s\n'
  1038. '%(gerrit_host)s\n'
  1039. '%(change_id)s\n'
  1040. '%(title)s\n'
  1041. '%(description)s\n'
  1042. '%(execution_time)s\n'
  1043. '%(exit_code)s\n'
  1044. '%(trace_name)s').start()
  1045. mock.patch('git_cl.shutil.make_archive',
  1046. lambda *args: self._mocked_call(['make_archive'] +
  1047. list(args))).start()
  1048. mock.patch('os.path.isfile',
  1049. lambda path: self._mocked_call(['os.path.isfile', path])).start()
  1050. mock.patch('git_cl.Changelist.GitSanityChecks', return_value=True).start()
  1051. self.mockGit.config['gerrit.host'] = 'true'
  1052. self.mockGit.config['branch.master.gerritissue'] = (
  1053. str(issue) if issue else None)
  1054. self.mockGit.config['remote.origin.url'] = (
  1055. 'https://%s.googlesource.com/my/repo' % short_hostname)
  1056. self.calls = self._gerrit_base_calls(
  1057. issue=issue,
  1058. fetched_description=fetched_description or description,
  1059. fetched_status=fetched_status,
  1060. other_cl_owner=other_cl_owner,
  1061. custom_cl_base=custom_cl_base,
  1062. short_hostname=short_hostname,
  1063. change_id=change_id)
  1064. if fetched_status != 'ABANDONED':
  1065. mock.patch(
  1066. 'tempfile.NamedTemporaryFile',
  1067. MakeNamedTemporaryFileMock(
  1068. self, expected_content=description)).start()
  1069. mock.patch('os.remove', return_value=True).start()
  1070. self.calls += self._gerrit_upload_calls(
  1071. description, reviewers, squash,
  1072. squash_mode=squash_mode,
  1073. expected_upstream_ref=expected_upstream_ref,
  1074. title=title, notify=notify,
  1075. post_amend_description=post_amend_description,
  1076. issue=issue, cc=cc,
  1077. custom_cl_base=custom_cl_base, tbr=tbr,
  1078. short_hostname=short_hostname,
  1079. labels=labels,
  1080. change_id=change_id,
  1081. original_title=original_title,
  1082. final_description=final_description,
  1083. gitcookies_exists=gitcookies_exists,
  1084. force=force,
  1085. edit_description=edit_description)
  1086. # Uncomment when debugging.
  1087. # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
  1088. git_cl.main(['upload'] + upload_args)
  1089. if squash:
  1090. self.assertIssueAndPatchset(patchset=None)
  1091. self.assertEqual(
  1092. 'abcdef0123456789',
  1093. scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
  1094. def test_gerrit_upload_traces_no_gitcookies(self):
  1095. self._run_gerrit_upload_test(
  1096. ['--no-squash'],
  1097. 'desc ✔\n\nBUG=\n',
  1098. [],
  1099. squash=False,
  1100. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1101. change_id='Ixxx',
  1102. gitcookies_exists=False)
  1103. def test_gerrit_upload_without_change_id(self):
  1104. self._run_gerrit_upload_test(
  1105. ['--no-squash'],
  1106. 'desc ✔\n\nBUG=\n',
  1107. [],
  1108. squash=False,
  1109. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1110. change_id='Ixxx')
  1111. def test_gerrit_upload_without_change_id_override_nosquash(self):
  1112. self._run_gerrit_upload_test(
  1113. [],
  1114. 'desc ✔\n\nBUG=\n',
  1115. [],
  1116. squash=False,
  1117. squash_mode='override_nosquash',
  1118. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1119. change_id='Ixxx')
  1120. def test_gerrit_no_reviewer(self):
  1121. self._run_gerrit_upload_test(
  1122. [],
  1123. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1124. [],
  1125. squash=False,
  1126. squash_mode='override_nosquash',
  1127. change_id='I123456789')
  1128. def test_gerrit_no_reviewer_non_chromium_host(self):
  1129. # TODO(crbug/877717): remove this test case.
  1130. self._run_gerrit_upload_test(
  1131. [],
  1132. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1133. [],
  1134. squash=False,
  1135. squash_mode='override_nosquash',
  1136. short_hostname='other',
  1137. change_id='I123456789')
  1138. def test_gerrit_patchset_title_special_chars(self):
  1139. self._run_gerrit_upload_test(
  1140. ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
  1141. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1142. squash=False,
  1143. squash_mode='override_nosquash',
  1144. title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D',
  1145. change_id='I123456789',
  1146. original_title='We\'ll escape ^_ ^ special chars...@{u}')
  1147. def test_gerrit_reviewers_cmd_line(self):
  1148. self._run_gerrit_upload_test(
  1149. ['-r', 'foo@example.com', '--send-mail'],
  1150. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1151. ['foo@example.com'],
  1152. squash=False,
  1153. squash_mode='override_nosquash',
  1154. notify=True,
  1155. change_id='I123456789',
  1156. final_description=(
  1157. 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
  1158. def test_gerrit_upload_force_sets_bug(self):
  1159. self._run_gerrit_upload_test(
  1160. ['-b', '10000', '-f'],
  1161. u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
  1162. [],
  1163. force=True,
  1164. expected_upstream_ref='origin/master',
  1165. fetched_description='desc=\n\nChange-Id: Ixxx',
  1166. original_title='Initial upload',
  1167. change_id='Ixxx')
  1168. def test_gerrit_upload_force_sets_bug_if_wrong_changeid(self):
  1169. self._run_gerrit_upload_test(
  1170. ['-b', '10000', '-f', '-m', 'Title'],
  1171. u'desc=\n\nChange-Id: Ixxxx\n\nChange-Id: Izzzz\nBug: 10000',
  1172. [],
  1173. force=True,
  1174. issue='123456',
  1175. expected_upstream_ref='origin/master',
  1176. fetched_description='desc=\n\nChange-Id: Ixxxx',
  1177. original_title='Title',
  1178. title='Title',
  1179. change_id='Izzzz')
  1180. def test_gerrit_upload_force_sets_fixed(self):
  1181. self._run_gerrit_upload_test(
  1182. ['-x', '10000', '-f'],
  1183. u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
  1184. [],
  1185. force=True,
  1186. expected_upstream_ref='origin/master',
  1187. fetched_description='desc=\n\nChange-Id: Ixxx',
  1188. original_title='Initial upload',
  1189. change_id='Ixxx')
  1190. def test_gerrit_reviewer_multiple(self):
  1191. mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
  1192. lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
  1193. self._run_gerrit_upload_test(
  1194. [],
  1195. 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
  1196. 'CC=more@example.com,people@example.com\n\n'
  1197. 'Change-Id: 123456789',
  1198. ['reviewer@example.com', 'another@example.com'],
  1199. expected_upstream_ref='origin/master',
  1200. cc=['more@example.com', 'people@example.com'],
  1201. tbr='reviewer@example.com',
  1202. labels={'Code-Review': 2},
  1203. change_id='123456789',
  1204. original_title='Initial upload')
  1205. def test_gerrit_upload_squash_first_is_default(self):
  1206. self._run_gerrit_upload_test(
  1207. [],
  1208. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1209. [],
  1210. expected_upstream_ref='origin/master',
  1211. change_id='123456789',
  1212. original_title='Initial upload')
  1213. def test_gerrit_upload_squash_first(self):
  1214. self._run_gerrit_upload_test(
  1215. ['--squash'],
  1216. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1217. [],
  1218. squash=True,
  1219. expected_upstream_ref='origin/master',
  1220. change_id='123456789',
  1221. original_title='Initial upload')
  1222. def test_gerrit_upload_squash_first_with_labels(self):
  1223. self._run_gerrit_upload_test(
  1224. ['--squash', '--cq-dry-run', '--enable-auto-submit'],
  1225. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1226. [],
  1227. squash=True,
  1228. expected_upstream_ref='origin/master',
  1229. labels={'Commit-Queue': 1, 'Auto-Submit': 1},
  1230. change_id='123456789',
  1231. original_title='Initial upload')
  1232. def test_gerrit_upload_squash_first_against_rev(self):
  1233. custom_cl_base = 'custom_cl_base_rev_or_branch'
  1234. self._run_gerrit_upload_test(
  1235. ['--squash', custom_cl_base],
  1236. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1237. [],
  1238. squash=True,
  1239. expected_upstream_ref='origin/master',
  1240. custom_cl_base=custom_cl_base,
  1241. change_id='123456789',
  1242. original_title='Initial upload')
  1243. self.assertIn(
  1244. 'If you proceed with upload, more than 1 CL may be created by Gerrit',
  1245. sys.stdout.getvalue())
  1246. def test_gerrit_upload_squash_reupload(self):
  1247. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1248. self._run_gerrit_upload_test(
  1249. ['--squash'],
  1250. description,
  1251. [],
  1252. squash=True,
  1253. expected_upstream_ref='origin/master',
  1254. issue=123456,
  1255. change_id='123456789',
  1256. original_title='User input')
  1257. @mock.patch('sys.stderr', StringIO())
  1258. def test_gerrit_upload_squash_reupload_to_abandoned(self):
  1259. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1260. with self.assertRaises(SystemExitMock):
  1261. self._run_gerrit_upload_test(
  1262. ['--squash'],
  1263. description,
  1264. [],
  1265. squash=True,
  1266. expected_upstream_ref='origin/master',
  1267. issue=123456,
  1268. fetched_status='ABANDONED',
  1269. change_id='123456789')
  1270. self.assertEqual(
  1271. 'Change https://chromium-review.googlesource.com/123456 has been '
  1272. 'abandoned, new uploads are not allowed\n',
  1273. sys.stderr.getvalue())
  1274. @mock.patch(
  1275. 'gerrit_util.GetAccountDetails',
  1276. return_value={'email': 'yet-another@example.com'})
  1277. def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
  1278. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1279. self._run_gerrit_upload_test(
  1280. ['--squash'],
  1281. description,
  1282. [],
  1283. squash=True,
  1284. expected_upstream_ref='origin/master',
  1285. issue=123456,
  1286. other_cl_owner='other@example.com',
  1287. change_id='123456789',
  1288. original_title='User input')
  1289. self.assertIn(
  1290. 'WARNING: Change 123456 is owned by other@example.com, but you '
  1291. 'authenticate to Gerrit as yet-another@example.com.\n'
  1292. 'Uploading may fail due to lack of permissions',
  1293. sys.stdout.getvalue())
  1294. def test_upload_change_description_editor(self):
  1295. fetched_description = 'foo\n\nChange-Id: 123456789'
  1296. description = 'bar\n\nChange-Id: 123456789'
  1297. self._run_gerrit_upload_test(
  1298. ['--squash', '--edit-description'],
  1299. description,
  1300. [],
  1301. fetched_description=fetched_description,
  1302. squash=True,
  1303. expected_upstream_ref='origin/master',
  1304. issue=123456,
  1305. change_id='123456789',
  1306. original_title='User input',
  1307. edit_description=description)
  1308. @mock.patch('git_cl.RunGit')
  1309. @mock.patch('git_cl.CMDupload')
  1310. @mock.patch('git_cl.ask_for_data')
  1311. def test_upload_branch_deps(self, *_mocks):
  1312. def mock_run_git(*args, **_kwargs):
  1313. if args[0] == ['for-each-ref',
  1314. '--format=%(refname:short) %(upstream:short)',
  1315. 'refs/heads']:
  1316. # Create a local branch dependency tree that looks like this:
  1317. # test1 -> test2 -> test3 -> test4 -> test5
  1318. # -> test3.1
  1319. # test6 -> test0
  1320. branch_deps = [
  1321. 'test2 test1', # test1 -> test2
  1322. 'test3 test2', # test2 -> test3
  1323. 'test3.1 test2', # test2 -> test3.1
  1324. 'test4 test3', # test3 -> test4
  1325. 'test5 test4', # test4 -> test5
  1326. 'test6 test0', # test0 -> test6
  1327. 'test7', # test7
  1328. ]
  1329. return '\n'.join(branch_deps)
  1330. git_cl.RunGit.side_effect = mock_run_git
  1331. git_cl.CMDupload.return_value = 0
  1332. class MockChangelist():
  1333. def __init__(self):
  1334. pass
  1335. def GetBranch(self):
  1336. return 'test1'
  1337. def GetIssue(self):
  1338. return '123'
  1339. def GetPatchset(self):
  1340. return '1001'
  1341. def IsGerrit(self):
  1342. return False
  1343. ret = git_cl.upload_branch_deps(MockChangelist(), [])
  1344. # CMDupload should have been called 5 times because of 5 dependent branches.
  1345. self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
  1346. git_cl.ask_for_data.assert_called_once_with(
  1347. 'This command will checkout all dependent branches '
  1348. 'and run "git cl upload". Press Enter to continue, '
  1349. 'or Ctrl+C to abort')
  1350. self.assertEqual(0, ret)
  1351. def test_gerrit_change_id(self):
  1352. self.calls = [
  1353. ((['git', 'write-tree'], ),
  1354. 'hashtree'),
  1355. ((['git', 'rev-parse', 'HEAD~0'], ),
  1356. 'branch-parent'),
  1357. ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
  1358. 'A B <a@b.org> 1456848326 +0100'),
  1359. ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
  1360. 'C D <c@d.org> 1456858326 +0100'),
  1361. ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
  1362. 'hashchange'),
  1363. ]
  1364. change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
  1365. self.assertEqual(change_id, 'Ihashchange')
  1366. def test_desecription_append_footer(self):
  1367. for init_desc, footer_line, expected_desc in [
  1368. # Use unique desc first lines for easy test failure identification.
  1369. ('foo', 'R=one', 'foo\n\nR=one'),
  1370. ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
  1371. ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  1372. ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  1373. ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
  1374. 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
  1375. ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
  1376. 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
  1377. ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
  1378. 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
  1379. ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
  1380. ]:
  1381. desc = git_cl.ChangeDescription(init_desc)
  1382. desc.append_footer(footer_line)
  1383. self.assertEqual(desc.description, expected_desc)
  1384. def test_update_reviewers(self):
  1385. data = [
  1386. ('foo', [], [],
  1387. 'foo'),
  1388. ('foo\nR=xx', [], [],
  1389. 'foo\nR=xx'),
  1390. ('foo\nTBR=xx', [], [],
  1391. 'foo\nTBR=xx'),
  1392. ('foo', ['a@c'], [],
  1393. 'foo\n\nR=a@c'),
  1394. ('foo\nR=xx', ['a@c'], [],
  1395. 'foo\n\nR=a@c, xx'),
  1396. ('foo\nTBR=xx', ['a@c'], [],
  1397. 'foo\n\nR=a@c\nTBR=xx'),
  1398. ('foo\nTBR=xx\nR=yy', ['a@c'], [],
  1399. 'foo\n\nR=a@c, yy\nTBR=xx'),
  1400. ('foo\nBUG=', ['a@c'], [],
  1401. 'foo\nBUG=\nR=a@c'),
  1402. ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
  1403. 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
  1404. ('foo', ['a@c', 'b@c'], [],
  1405. 'foo\n\nR=a@c, b@c'),
  1406. ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
  1407. 'foo\nBar\n\nR=c@c\nBUG='),
  1408. ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
  1409. 'foo\nBar\n\nR=c@c\nBUG='),
  1410. # Same as the line before, but full of whitespaces.
  1411. (
  1412. 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
  1413. 'foo\nBar\n\nR=c@c\n BUG =',
  1414. ),
  1415. # Whitespaces aren't interpreted as new lines.
  1416. ('foo BUG=allo R=joe ', ['c@c'], [],
  1417. 'foo BUG=allo R=joe\n\nR=c@c'),
  1418. # Redundant TBRs get promoted to Rs
  1419. ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
  1420. 'foo\n\nR=a@c, b@c\nTBR=t@c'),
  1421. ]
  1422. expected = [i[-1] for i in data]
  1423. actual = []
  1424. for orig, reviewers, tbrs, _expected in data:
  1425. obj = git_cl.ChangeDescription(orig)
  1426. obj.update_reviewers(reviewers, tbrs)
  1427. actual.append(obj.description)
  1428. self.assertEqual(expected, actual)
  1429. def test_get_hash_tags(self):
  1430. cases = [
  1431. ('', []),
  1432. ('a', []),
  1433. ('[a]', ['a']),
  1434. ('[aa]', ['aa']),
  1435. ('[a ]', ['a']),
  1436. ('[a- ]', ['a']),
  1437. ('[a- b]', ['a-b']),
  1438. ('[a--b]', ['a-b']),
  1439. ('[a', []),
  1440. ('[a]x', ['a']),
  1441. ('[aa]x', ['aa']),
  1442. ('[a b]', ['a-b']),
  1443. ('[a b]', ['a-b']),
  1444. ('[a__b]', ['a-b']),
  1445. ('[a] x', ['a']),
  1446. ('[a][b]', ['a', 'b']),
  1447. ('[a] [b]', ['a', 'b']),
  1448. ('[a][b]x', ['a', 'b']),
  1449. ('[a][b] x', ['a', 'b']),
  1450. ('[a]\n[b]', ['a']),
  1451. ('[a\nb]', []),
  1452. ('[a][', ['a']),
  1453. ('Revert "[a] feature"', ['a']),
  1454. ('Reland "[a] feature"', ['a']),
  1455. ('Revert: [a] feature', ['a']),
  1456. ('Reland: [a] feature', ['a']),
  1457. ('Revert "Reland: [a] feature"', ['a']),
  1458. ('Foo: feature', ['foo']),
  1459. ('Foo Bar: feature', ['foo-bar']),
  1460. ('Change Foo::Bar', []),
  1461. ('Foo: Change Foo::Bar', ['foo']),
  1462. ('Revert "Foo bar: feature"', ['foo-bar']),
  1463. ('Reland "Foo bar: feature"', ['foo-bar']),
  1464. ]
  1465. for desc, expected in cases:
  1466. change_desc = git_cl.ChangeDescription(desc)
  1467. actual = change_desc.get_hash_tags()
  1468. self.assertEqual(
  1469. actual,
  1470. expected,
  1471. 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
  1472. self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
  1473. self.assertEqual(None, git_cl.GetTargetRef(None,
  1474. 'refs/remotes/origin/master',
  1475. 'master'))
  1476. # Check default target refs for branches.
  1477. self.assertEqual('refs/heads/master',
  1478. git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
  1479. None))
  1480. self.assertEqual('refs/heads/master',
  1481. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
  1482. None))
  1483. self.assertEqual('refs/heads/master',
  1484. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
  1485. None))
  1486. self.assertEqual('refs/branch-heads/123',
  1487. git_cl.GetTargetRef('origin',
  1488. 'refs/remotes/branch-heads/123',
  1489. None))
  1490. self.assertEqual('refs/diff/test',
  1491. git_cl.GetTargetRef('origin',
  1492. 'refs/remotes/origin/refs/diff/test',
  1493. None))
  1494. self.assertEqual('refs/heads/chrome/m42',
  1495. git_cl.GetTargetRef('origin',
  1496. 'refs/remotes/origin/chrome/m42',
  1497. None))
  1498. # Check target refs for user-specified target branch.
  1499. for branch in ('branch-heads/123', 'remotes/branch-heads/123',
  1500. 'refs/remotes/branch-heads/123'):
  1501. self.assertEqual('refs/branch-heads/123',
  1502. git_cl.GetTargetRef('origin',
  1503. 'refs/remotes/origin/master',
  1504. branch))
  1505. for branch in ('origin/master', 'remotes/origin/master',
  1506. 'refs/remotes/origin/master'):
  1507. self.assertEqual('refs/heads/master',
  1508. git_cl.GetTargetRef('origin',
  1509. 'refs/remotes/branch-heads/123',
  1510. branch))
  1511. for branch in ('master', 'heads/master', 'refs/heads/master'):
  1512. self.assertEqual('refs/heads/master',
  1513. git_cl.GetTargetRef('origin',
  1514. 'refs/remotes/branch-heads/123',
  1515. branch))
  1516. @mock.patch('git_common.is_dirty_git_tree', return_value=True)
  1517. def test_patch_when_dirty(self, *_mocks):
  1518. # Patch when local tree is dirty.
  1519. self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
  1520. def assertIssueAndPatchset(
  1521. self, branch='master', issue='123456', patchset='7',
  1522. git_short_host='chromium'):
  1523. self.assertEqual(
  1524. issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
  1525. self.assertEqual(
  1526. patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
  1527. self.assertEqual(
  1528. 'https://%s-review.googlesource.com' % git_short_host,
  1529. scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
  1530. def _patch_common(self, git_short_host='chromium'):
  1531. mock.patch('git_cl.IsGitVersionAtLeast', return_value=True).start()
  1532. self.mockGit.config['remote.origin.url'] = (
  1533. 'https://%s.googlesource.com/my/repo' % git_short_host)
  1534. gerrit_util.GetChangeDetail.return_value = {
  1535. 'current_revision': '7777777777',
  1536. 'revisions': {
  1537. '1111111111': {
  1538. '_number': 1,
  1539. 'fetch': {'http': {
  1540. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  1541. 'ref': 'refs/changes/56/123456/1',
  1542. }},
  1543. },
  1544. '7777777777': {
  1545. '_number': 7,
  1546. 'fetch': {'http': {
  1547. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  1548. 'ref': 'refs/changes/56/123456/7',
  1549. }},
  1550. },
  1551. },
  1552. }
  1553. def test_patch_gerrit_default(self):
  1554. self._patch_common()
  1555. self.calls += [
  1556. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1557. 'refs/changes/56/123456/7'],), ''),
  1558. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1559. ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
  1560. ]
  1561. self.assertEqual(git_cl.main(['patch', '123456']), 0)
  1562. self.assertIssueAndPatchset()
  1563. def test_patch_gerrit_new_branch(self):
  1564. self._patch_common()
  1565. self.calls += [
  1566. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1567. 'refs/changes/56/123456/7'],), ''),
  1568. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1569. ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
  1570. ]
  1571. self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
  1572. self.assertIssueAndPatchset(branch='feature')
  1573. def test_patch_gerrit_force(self):
  1574. self._patch_common('host')
  1575. self.calls += [
  1576. ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
  1577. 'refs/changes/56/123456/7'],), ''),
  1578. ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
  1579. ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
  1580. ]
  1581. self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
  1582. self.assertIssueAndPatchset(git_short_host='host')
  1583. def test_patch_gerrit_guess_by_url(self):
  1584. self._patch_common('else')
  1585. self.calls += [
  1586. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  1587. 'refs/changes/56/123456/1'],), ''),
  1588. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1589. ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
  1590. ]
  1591. self.assertEqual(git_cl.main(
  1592. ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
  1593. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  1594. def test_patch_gerrit_guess_by_url_with_repo(self):
  1595. self._patch_common('else')
  1596. self.calls += [
  1597. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  1598. 'refs/changes/56/123456/1'],), ''),
  1599. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  1600. ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
  1601. ]
  1602. self.assertEqual(git_cl.main(
  1603. ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
  1604. 0)
  1605. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  1606. @mock.patch('sys.stderr', StringIO())
  1607. def test_patch_gerrit_conflict(self):
  1608. self._patch_common()
  1609. self.calls += [
  1610. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  1611. 'refs/changes/56/123456/7'],), ''),
  1612. ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
  1613. ]
  1614. with self.assertRaises(SystemExitMock):
  1615. git_cl.main(['patch', '123456'])
  1616. self.assertEqual(
  1617. 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
  1618. sys.stderr.getvalue())
  1619. @mock.patch(
  1620. 'gerrit_util.GetChangeDetail',
  1621. side_effect=gerrit_util.GerritError(404, ''))
  1622. @mock.patch('sys.stderr', StringIO())
  1623. def test_patch_gerrit_not_exists(self, *_mocks):
  1624. self.mockGit.config['remote.origin.url'] = (
  1625. 'https://chromium.googlesource.com/my/repo')
  1626. with self.assertRaises(SystemExitMock):
  1627. self.assertEqual(1, git_cl.main(['patch', '123456']))
  1628. self.assertEqual(
  1629. 'change 123456 at https://chromium-review.googlesource.com does not '
  1630. 'exist or you have no access to it\n',
  1631. sys.stderr.getvalue())
  1632. def _checkout_calls(self):
  1633. return [
  1634. ((['git', 'config', '--local', '--get-regexp',
  1635. 'branch\\..*\\.gerritissue'], ),
  1636. ('branch.ger-branch.gerritissue 123456\n'
  1637. 'branch.gbranch654.gerritissue 654321\n')),
  1638. ]
  1639. def test_checkout_gerrit(self):
  1640. """Tests git cl checkout <issue>."""
  1641. self.calls = self._checkout_calls()
  1642. self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
  1643. self.assertEqual(0, git_cl.main(['checkout', '123456']))
  1644. def test_checkout_not_found(self):
  1645. """Tests git cl checkout <issue>."""
  1646. self.calls = self._checkout_calls()
  1647. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  1648. def test_checkout_no_branch_issues(self):
  1649. """Tests git cl checkout <issue>."""
  1650. self.calls = [
  1651. ((['git', 'config', '--local', '--get-regexp',
  1652. 'branch\\..*\\.gerritissue'], ), CERR1),
  1653. ]
  1654. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  1655. def _test_gerrit_ensure_authenticated_common(self, auth):
  1656. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  1657. CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
  1658. self.mockGit.config['remote.origin.url'] = (
  1659. 'https://chromium.googlesource.com/my/repo')
  1660. cl = git_cl.Changelist()
  1661. cl.branch = 'master'
  1662. cl.branchref = 'refs/heads/master'
  1663. return cl
  1664. @mock.patch('sys.stderr', StringIO())
  1665. def test_gerrit_ensure_authenticated_missing(self):
  1666. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1667. 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
  1668. })
  1669. with self.assertRaises(SystemExitMock):
  1670. cl.EnsureAuthenticated(force=False)
  1671. self.assertEqual(
  1672. 'Credentials for the following hosts are required:\n'
  1673. ' chromium-review.googlesource.com\n'
  1674. 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
  1675. 'You can (re)generate your credentials by visiting '
  1676. 'https://chromium-review.googlesource.com/new-password\n',
  1677. sys.stderr.getvalue())
  1678. def test_gerrit_ensure_authenticated_conflict(self):
  1679. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1680. 'chromium.googlesource.com':
  1681. ('git-one.example.com', None, 'secret1'),
  1682. 'chromium-review.googlesource.com':
  1683. ('git-other.example.com', None, 'secret2'),
  1684. })
  1685. self.calls.append(
  1686. (('ask_for_data', 'If you know what you are doing '
  1687. 'press Enter to continue, or Ctrl+C to abort'), ''))
  1688. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1689. def test_gerrit_ensure_authenticated_ok(self):
  1690. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1691. 'chromium.googlesource.com':
  1692. ('git-same.example.com', None, 'secret'),
  1693. 'chromium-review.googlesource.com':
  1694. ('git-same.example.com', None, 'secret'),
  1695. })
  1696. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1697. def test_gerrit_ensure_authenticated_skipped(self):
  1698. self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
  1699. cl = self._test_gerrit_ensure_authenticated_common(auth={})
  1700. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1701. def test_gerrit_ensure_authenticated_bearer_token(self):
  1702. cl = self._test_gerrit_ensure_authenticated_common(auth={
  1703. 'chromium.googlesource.com':
  1704. ('', None, 'secret'),
  1705. 'chromium-review.googlesource.com':
  1706. ('', None, 'secret'),
  1707. })
  1708. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1709. header = gerrit_util.CookiesAuthenticator().get_auth_header(
  1710. 'chromium.googlesource.com')
  1711. self.assertTrue('Bearer' in header)
  1712. def test_gerrit_ensure_authenticated_non_https(self):
  1713. self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
  1714. self.calls = [
  1715. (('logging.warning',
  1716. 'Ignoring branch %(branch)s with non-https remote '
  1717. '%(remote)s', {
  1718. 'branch': 'master',
  1719. 'remote': 'custom-scheme://repo'}
  1720. ), None),
  1721. ]
  1722. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  1723. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  1724. mock.patch('logging.warning',
  1725. lambda *a: self._mocked_call('logging.warning', *a)).start()
  1726. cl = git_cl.Changelist()
  1727. cl.branch = 'master'
  1728. cl.branchref = 'refs/heads/master'
  1729. cl.lookedup_issue = True
  1730. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1731. def test_gerrit_ensure_authenticated_non_url(self):
  1732. self.mockGit.config['remote.origin.url'] = (
  1733. 'git@somehost.example:foo/bar.git')
  1734. self.calls = [
  1735. (('logging.error',
  1736. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  1737. 'but it doesn\'t exist.', {
  1738. 'remote': 'origin',
  1739. 'branch': 'master',
  1740. 'url': 'git@somehost.example:foo/bar.git'}
  1741. ), None),
  1742. ]
  1743. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  1744. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  1745. mock.patch('logging.error',
  1746. lambda *a: self._mocked_call('logging.error', *a)).start()
  1747. cl = git_cl.Changelist()
  1748. cl.branch = 'master'
  1749. cl.branchref = 'refs/heads/master'
  1750. cl.lookedup_issue = True
  1751. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  1752. def _cmd_set_commit_gerrit_common(self, vote, notify=None):
  1753. self.mockGit.config['branch.master.gerritissue'] = '123'
  1754. self.mockGit.config['branch.master.gerritserver'] = (
  1755. 'https://chromium-review.googlesource.com')
  1756. self.mockGit.config['remote.origin.url'] = (
  1757. 'https://chromium.googlesource.com/infra/infra')
  1758. self.calls = [
  1759. (('SetReview', 'chromium-review.googlesource.com',
  1760. 'infra%2Finfra~123', None,
  1761. {'Commit-Queue': vote}, notify, None), ''),
  1762. ]
  1763. def test_cmd_set_commit_gerrit_clear(self):
  1764. self._cmd_set_commit_gerrit_common(0)
  1765. self.assertEqual(0, git_cl.main(['set-commit', '-c']))
  1766. def test_cmd_set_commit_gerrit_dry(self):
  1767. self._cmd_set_commit_gerrit_common(1, notify=False)
  1768. self.assertEqual(0, git_cl.main(['set-commit', '-d']))
  1769. def test_cmd_set_commit_gerrit(self):
  1770. self._cmd_set_commit_gerrit_common(2)
  1771. self.assertEqual(0, git_cl.main(['set-commit']))
  1772. def test_description_display(self):
  1773. mock.patch('git_cl.Changelist', ChangelistMock).start()
  1774. ChangelistMock.desc = 'foo\n'
  1775. self.assertEqual(0, git_cl.main(['description', '-d']))
  1776. self.assertEqual('foo\n', sys.stdout.getvalue())
  1777. @mock.patch('sys.stderr', StringIO())
  1778. def test_StatusFieldOverrideIssueMissingArgs(self):
  1779. try:
  1780. self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
  1781. except SystemExitMock:
  1782. self.assertIn(
  1783. '--field must be given when --issue is set.', sys.stderr.getvalue())
  1784. def test_StatusFieldOverrideIssue(self):
  1785. def assertIssue(cl_self, *_args):
  1786. self.assertEqual(cl_self.issue, 1)
  1787. return 'foobar'
  1788. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  1789. self.assertEqual(
  1790. git_cl.main(['status', '--issue', '1', '--field', 'desc']),
  1791. 0)
  1792. self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
  1793. def test_SetCloseOverrideIssue(self):
  1794. def assertIssue(cl_self, *_args):
  1795. self.assertEqual(cl_self.issue, 1)
  1796. return 'foobar'
  1797. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  1798. mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
  1799. self.assertEqual(
  1800. git_cl.main(['set-close', '--issue', '1']), 0)
  1801. def test_description(self):
  1802. self.mockGit.config['remote.origin.url'] = (
  1803. 'https://chromium.googlesource.com/my/repo')
  1804. gerrit_util.GetChangeDetail.return_value = {
  1805. 'current_revision': 'sha1',
  1806. 'revisions': {'sha1': {
  1807. 'commit': {'message': 'foobar'},
  1808. }},
  1809. }
  1810. self.assertEqual(0, git_cl.main([
  1811. 'description',
  1812. 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
  1813. '-d']))
  1814. self.assertEqual('foobar\n', sys.stdout.getvalue())
  1815. def test_description_set_raw(self):
  1816. mock.patch('git_cl.Changelist', ChangelistMock).start()
  1817. mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
  1818. self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
  1819. self.assertEqual('hihi', ChangelistMock.desc)
  1820. def test_description_appends_bug_line(self):
  1821. current_desc = 'Some.\n\nChange-Id: xxx'
  1822. def RunEditor(desc, _, **kwargs):
  1823. self.assertEqual(
  1824. '# Enter a description of the change.\n'
  1825. '# This will be displayed on the codereview site.\n'
  1826. '# The first line will also be used as the subject of the review.\n'
  1827. '#--------------------This line is 72 characters long'
  1828. '--------------------\n'
  1829. 'Some.\n\nChange-Id: xxx\nBug: ',
  1830. desc)
  1831. # Simulate user changing something.
  1832. return 'Some.\n\nChange-Id: xxx\nBug: 123'
  1833. def UpdateDescription(_, desc, force=False):
  1834. self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
  1835. mock.patch('git_cl.Changelist.FetchDescription',
  1836. lambda *args: current_desc).start()
  1837. mock.patch('git_cl.Changelist.UpdateDescription',
  1838. UpdateDescription).start()
  1839. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  1840. self.mockGit.config['branch.master.gerritissue'] = '123'
  1841. self.assertEqual(0, git_cl.main(['description']))
  1842. def test_description_does_not_append_bug_line_if_fixed_is_present(self):
  1843. current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
  1844. def RunEditor(desc, _, **kwargs):
  1845. self.assertEqual(
  1846. '# Enter a description of the change.\n'
  1847. '# This will be displayed on the codereview site.\n'
  1848. '# The first line will also be used as the subject of the review.\n'
  1849. '#--------------------This line is 72 characters long'
  1850. '--------------------\n'
  1851. 'Some.\n\nFixed: 123\nChange-Id: xxx',
  1852. desc)
  1853. return desc
  1854. mock.patch('git_cl.Changelist.FetchDescription',
  1855. lambda *args: current_desc).start()
  1856. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  1857. self.mockGit.config['branch.master.gerritissue'] = '123'
  1858. self.assertEqual(0, git_cl.main(['description']))
  1859. def test_description_set_stdin(self):
  1860. mock.patch('git_cl.Changelist', ChangelistMock).start()
  1861. mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
  1862. self.assertEqual(0, git_cl.main(['description', '-n', '-']))
  1863. self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
  1864. def test_archive(self):
  1865. self.calls = [
  1866. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1867. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  1868. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  1869. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
  1870. ((['git', 'branch', '-D', 'foo'],), '')
  1871. ]
  1872. mock.patch('git_cl.get_cl_statuses',
  1873. lambda branches, fine_grained, max_processes:
  1874. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  1875. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  1876. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  1877. self.assertEqual(0, git_cl.main(['archive', '-f']))
  1878. def test_archive_tag_collision(self):
  1879. self.calls = [
  1880. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1881. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  1882. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
  1883. 'refs/tags/git-cl-archived-456-foo'),
  1884. ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
  1885. ((['git', 'branch', '-D', 'foo'],), '')
  1886. ]
  1887. mock.patch('git_cl.get_cl_statuses',
  1888. lambda branches, fine_grained, max_processes:
  1889. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  1890. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  1891. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  1892. self.assertEqual(0, git_cl.main(['archive', '-f']))
  1893. def test_archive_current_branch_fails(self):
  1894. self.calls = [
  1895. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1896. 'refs/heads/master'),
  1897. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  1898. ]
  1899. mock.patch('git_cl.get_cl_statuses',
  1900. lambda branches, fine_grained, max_processes:
  1901. [(MockChangelistWithBranchAndIssue('master', 1),
  1902. 'closed')]).start()
  1903. self.assertEqual(1, git_cl.main(['archive', '-f']))
  1904. def test_archive_dry_run(self):
  1905. self.calls = [
  1906. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1907. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  1908. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  1909. ]
  1910. mock.patch('git_cl.get_cl_statuses',
  1911. lambda branches, fine_grained, max_processes:
  1912. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  1913. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  1914. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  1915. self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
  1916. def test_archive_no_tags(self):
  1917. self.calls = [
  1918. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1919. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  1920. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  1921. ((['git', 'branch', '-D', 'foo'],), '')
  1922. ]
  1923. mock.patch('git_cl.get_cl_statuses',
  1924. lambda branches, fine_grained, max_processes:
  1925. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  1926. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  1927. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  1928. self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
  1929. def test_archive_tag_cleanup_on_branch_deletion_error(self):
  1930. self.calls = [
  1931. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  1932. 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
  1933. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  1934. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
  1935. 'refs/tags/git-cl-archived-456-foo'),
  1936. ((['git', 'branch', '-D', 'foo'],), CERR1),
  1937. ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
  1938. 'refs/tags/git-cl-archived-456-foo'),
  1939. ]
  1940. mock.patch('git_cl.get_cl_statuses',
  1941. lambda branches, fine_grained, max_processes:
  1942. [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
  1943. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  1944. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  1945. self.assertEqual(0, git_cl.main(['archive', '-f']))
  1946. def test_cmd_issue_erase_existing(self):
  1947. self.mockGit.config['branch.master.gerritissue'] = '123'
  1948. self.mockGit.config['branch.master.gerritserver'] = (
  1949. 'https://chromium-review.googlesource.com')
  1950. self.calls = [
  1951. ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
  1952. ]
  1953. self.assertEqual(0, git_cl.main(['issue', '0']))
  1954. self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
  1955. self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
  1956. def test_cmd_issue_erase_existing_with_change_id(self):
  1957. self.mockGit.config['branch.master.gerritissue'] = '123'
  1958. self.mockGit.config['branch.master.gerritserver'] = (
  1959. 'https://chromium-review.googlesource.com')
  1960. mock.patch('git_cl.Changelist.FetchDescription',
  1961. lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
  1962. self.calls = [
  1963. ((['git', 'log', '-1', '--format=%B'],),
  1964. 'This is a description\n\nChange-Id: Ideadbeef'),
  1965. ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
  1966. ]
  1967. self.assertEqual(0, git_cl.main(['issue', '0']))
  1968. self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
  1969. self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
  1970. def test_cmd_issue_json(self):
  1971. self.mockGit.config['branch.master.gerritissue'] = '123'
  1972. self.mockGit.config['branch.master.gerritserver'] = (
  1973. 'https://chromium-review.googlesource.com')
  1974. self.calls = [
  1975. (('write_json', 'output.json',
  1976. {'issue': 123,
  1977. 'issue_url': 'https://chromium-review.googlesource.com/123'}),
  1978. ''),
  1979. ]
  1980. self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
  1981. def _common_GerritCommitMsgHookCheck(self):
  1982. mock.patch(
  1983. 'git_cl.os.path.abspath',
  1984. lambda path: self._mocked_call(['abspath', path])).start()
  1985. mock.patch(
  1986. 'git_cl.os.path.exists',
  1987. lambda path: self._mocked_call(['exists', path])).start()
  1988. mock.patch(
  1989. 'git_cl.gclient_utils.FileRead',
  1990. lambda path: self._mocked_call(['FileRead', path])).start()
  1991. mock.patch(
  1992. 'git_cl.gclient_utils.rm_file_or_tree',
  1993. lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
  1994. return git_cl.Changelist(issue=123)
  1995. def test_GerritCommitMsgHookCheck_custom_hook(self):
  1996. cl = self._common_GerritCommitMsgHookCheck()
  1997. self.calls += [
  1998. ((['exists', '.git/hooks/commit-msg'],), True),
  1999. ((['FileRead', '.git/hooks/commit-msg'],),
  2000. '#!/bin/sh\necho "custom hook"')
  2001. ]
  2002. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2003. def test_GerritCommitMsgHookCheck_not_exists(self):
  2004. cl = self._common_GerritCommitMsgHookCheck()
  2005. self.calls += [
  2006. ((['exists', '.git/hooks/commit-msg'],), False),
  2007. ]
  2008. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2009. def test_GerritCommitMsgHookCheck(self):
  2010. cl = self._common_GerritCommitMsgHookCheck()
  2011. self.calls += [
  2012. ((['exists', '.git/hooks/commit-msg'],), True),
  2013. ((['FileRead', '.git/hooks/commit-msg'],),
  2014. '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
  2015. (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
  2016. ((['rm_file_or_tree', '.git/hooks/commit-msg'],),
  2017. ''),
  2018. ]
  2019. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2020. def test_GerritCmdLand(self):
  2021. self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
  2022. self.mockGit.config['branch.master.gerritserver'] = (
  2023. 'chromium-review.googlesource.com')
  2024. self.calls += [
  2025. ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
  2026. ]
  2027. cl = git_cl.Changelist(issue=123)
  2028. cl._GetChangeDetail = lambda *args, **kwargs: {
  2029. 'labels': {},
  2030. 'current_revision': 'deadbeaf',
  2031. }
  2032. cl._GetChangeCommit = lambda: {
  2033. 'commit': 'deadbeef',
  2034. 'web_links': [{'name': 'gitiles',
  2035. 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
  2036. }
  2037. cl.SubmitIssue = lambda wait_for_merge: None
  2038. self.assertEqual(0, cl.CMDLand(force=True,
  2039. bypass_hooks=True,
  2040. verbose=True,
  2041. parallel=False))
  2042. self.assertIn(
  2043. 'Issue chromium-review.googlesource.com/123 has been submitted',
  2044. sys.stdout.getvalue())
  2045. self.assertIn(
  2046. 'Landed as: https://git.googlesource.com/test/+/deadbeef',
  2047. sys.stdout.getvalue())
  2048. def _mock_gerrit_changes_for_detail_cache(self):
  2049. mock.patch('git_cl.Changelist._GetGerritHost', lambda _: 'host').start()
  2050. def test_gerrit_change_detail_cache_simple(self):
  2051. self._mock_gerrit_changes_for_detail_cache()
  2052. gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
  2053. cl1 = git_cl.Changelist(issue=1)
  2054. cl1._cached_remote_url = (
  2055. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2056. cl2 = git_cl.Changelist(issue=2)
  2057. cl2._cached_remote_url = (
  2058. True, 'https://chromium.googlesource.com/ab/repo')
  2059. self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
  2060. self.assertEqual(cl1._GetChangeDetail(), 'a')
  2061. self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
  2062. def test_gerrit_change_detail_cache_options(self):
  2063. self._mock_gerrit_changes_for_detail_cache()
  2064. gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
  2065. cl = git_cl.Changelist(issue=1)
  2066. cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
  2067. self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
  2068. self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
  2069. self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
  2070. self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
  2071. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2072. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2073. self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
  2074. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2075. self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
  2076. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2077. def test_gerrit_description_caching(self):
  2078. gerrit_util.GetChangeDetail.return_value = {
  2079. 'current_revision': 'rev1',
  2080. 'revisions': {
  2081. 'rev1': {'commit': {'message': 'desc1'}},
  2082. },
  2083. }
  2084. self._mock_gerrit_changes_for_detail_cache()
  2085. cl = git_cl.Changelist(issue=1)
  2086. cl._cached_remote_url = (
  2087. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2088. self.assertEqual(cl.FetchDescription(), 'desc1')
  2089. self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
  2090. def test_print_current_creds(self):
  2091. class CookiesAuthenticatorMock(object):
  2092. def __init__(self):
  2093. self.gitcookies = {
  2094. 'host.googlesource.com': ('user', 'pass'),
  2095. 'host-review.googlesource.com': ('user', 'pass'),
  2096. }
  2097. self.netrc = self
  2098. self.netrc.hosts = {
  2099. 'github.com': ('user2', None, 'pass2'),
  2100. 'host2.googlesource.com': ('user3', None, 'pass'),
  2101. }
  2102. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2103. CookiesAuthenticatorMock).start()
  2104. git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
  2105. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2106. ' Host\t User\t Which file',
  2107. '============================\t=====\t===========',
  2108. 'host-review.googlesource.com\t user\t.gitcookies',
  2109. ' host.googlesource.com\t user\t.gitcookies',
  2110. ' host2.googlesource.com\tuser3\t .netrc',
  2111. ])
  2112. sys.stdout.seek(0)
  2113. sys.stdout.truncate(0)
  2114. git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
  2115. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2116. ' Host\tUser\t Which file',
  2117. '============================\t====\t===========',
  2118. 'host-review.googlesource.com\tuser\t.gitcookies',
  2119. ' host.googlesource.com\tuser\t.gitcookies',
  2120. ])
  2121. def _common_creds_check_mocks(self):
  2122. def exists_mock(path):
  2123. dirname = os.path.dirname(path)
  2124. if dirname == os.path.expanduser('~'):
  2125. dirname = '~'
  2126. base = os.path.basename(path)
  2127. if base in ('.netrc', '.gitcookies'):
  2128. return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
  2129. # git cl also checks for existence other files not relevant to this test.
  2130. return None
  2131. mock.patch('os.path.exists', exists_mock).start()
  2132. def test_creds_check_gitcookies_not_configured(self):
  2133. self._common_creds_check_mocks()
  2134. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2135. lambda _, include_netrc=False: []).start()
  2136. self.calls = [
  2137. ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
  2138. ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
  2139. (('os.path.exists', '~/.netrc'), True),
  2140. (('ask_for_data', 'Press Enter to setup .gitcookies, '
  2141. 'or Ctrl+C to abort'), ''),
  2142. ((['git', 'config', '--global', 'http.cookiefile',
  2143. os.path.expanduser('~/.gitcookies')], ), ''),
  2144. ]
  2145. self.assertEqual(0, git_cl.main(['creds-check']))
  2146. self.assertTrue(
  2147. sys.stdout.getvalue().startswith(
  2148. 'You seem to be using outdated .netrc for git credentials:'))
  2149. self.assertIn(
  2150. '\nConfigured git to use .gitcookies from',
  2151. sys.stdout.getvalue())
  2152. def test_creds_check_gitcookies_configured_custom_broken(self):
  2153. self._common_creds_check_mocks()
  2154. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2155. lambda _, include_netrc=False: []).start()
  2156. self.calls = [
  2157. ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
  2158. ((['git', 'config', '--global', 'http.cookiefile'],),
  2159. '/custom/.gitcookies'),
  2160. (('os.path.exists', '/custom/.gitcookies'), False),
  2161. (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
  2162. 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
  2163. ((['git', 'config', '--global', 'http.cookiefile',
  2164. os.path.expanduser('~/.gitcookies')], ), ''),
  2165. ]
  2166. self.assertEqual(0, git_cl.main(['creds-check']))
  2167. self.assertIn(
  2168. 'WARNING: You have configured custom path to .gitcookies: ',
  2169. sys.stdout.getvalue())
  2170. self.assertIn(
  2171. 'However, your configured .gitcookies file is missing.',
  2172. sys.stdout.getvalue())
  2173. def test_git_cl_comment_add_gerrit(self):
  2174. self.mockGit.branchref = None
  2175. self.mockGit.config['remote.origin.url'] = (
  2176. 'https://chromium.googlesource.com/infra/infra')
  2177. self.calls = [
  2178. (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
  2179. 'msg', None, None, None),
  2180. None),
  2181. ]
  2182. self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
  2183. @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
  2184. def test_git_cl_comments_fetch_gerrit(self, *_mocks):
  2185. self.mockGit.config['remote.origin.url'] = (
  2186. 'https://chromium.googlesource.com/infra/infra')
  2187. gerrit_util.GetChangeDetail.return_value = {
  2188. 'owner': {'email': 'owner@example.com'},
  2189. 'current_revision': 'ba5eba11',
  2190. 'revisions': {
  2191. 'deadbeaf': {
  2192. '_number': 1,
  2193. },
  2194. 'ba5eba11': {
  2195. '_number': 2,
  2196. },
  2197. },
  2198. 'messages': [
  2199. {
  2200. u'_revision_number': 1,
  2201. u'author': {
  2202. u'_account_id': 1111084,
  2203. u'email': u'commit-bot@chromium.org',
  2204. u'name': u'Commit Bot'
  2205. },
  2206. u'date': u'2017-03-15 20:08:45.000000000',
  2207. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  2208. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  2209. u'tag': u'autogenerated:cq:dry-run'
  2210. },
  2211. {
  2212. u'_revision_number': 2,
  2213. u'author': {
  2214. u'_account_id': 11151243,
  2215. u'email': u'owner@example.com',
  2216. u'name': u'owner'
  2217. },
  2218. u'date': u'2017-03-16 20:00:41.000000000',
  2219. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  2220. u'message': u'PTAL',
  2221. },
  2222. {
  2223. u'_revision_number': 2,
  2224. u'author': {
  2225. u'_account_id': 148512,
  2226. u'email': u'reviewer@example.com',
  2227. u'name': u'reviewer'
  2228. },
  2229. u'date': u'2017-03-17 05:19:37.500000000',
  2230. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  2231. u'message': u'Patch Set 2: Code-Review+1',
  2232. },
  2233. ]
  2234. }
  2235. self.calls = [
  2236. (('GetChangeComments', 'chromium-review.googlesource.com',
  2237. 'infra%2Finfra~1'), {
  2238. '/COMMIT_MSG': [
  2239. {
  2240. 'author': {'email': u'reviewer@example.com'},
  2241. 'updated': u'2017-03-17 05:19:37.500000000',
  2242. 'patch_set': 2,
  2243. 'side': 'REVISION',
  2244. 'message': 'Please include a bug link',
  2245. },
  2246. ],
  2247. 'codereview.settings': [
  2248. {
  2249. 'author': {'email': u'owner@example.com'},
  2250. 'updated': u'2017-03-16 20:00:41.000000000',
  2251. 'patch_set': 2,
  2252. 'side': 'PARENT',
  2253. 'line': 42,
  2254. 'message': 'I removed this because it is bad',
  2255. },
  2256. ]
  2257. }),
  2258. (('GetChangeRobotComments', 'chromium-review.googlesource.com',
  2259. 'infra%2Finfra~1'), {}),
  2260. ] * 2 + [
  2261. (('write_json', 'output.json', [
  2262. {
  2263. u'date': u'2017-03-16 20:00:41.000000',
  2264. u'message': (
  2265. u'PTAL\n' +
  2266. u'\n' +
  2267. u'codereview.settings\n' +
  2268. u' Base, Line 42: https://chromium-review.googlesource.com/' +
  2269. u'c/1/2/codereview.settings#b42\n' +
  2270. u' I removed this because it is bad\n'),
  2271. u'autogenerated': False,
  2272. u'approval': False,
  2273. u'disapproval': False,
  2274. u'sender': u'owner@example.com'
  2275. }, {
  2276. u'date': u'2017-03-17 05:19:37.500000',
  2277. u'message': (
  2278. u'Patch Set 2: Code-Review+1\n' +
  2279. u'\n' +
  2280. u'/COMMIT_MSG\n' +
  2281. u' PS2, File comment: https://chromium-review.googlesource' +
  2282. u'.com/c/1/2//COMMIT_MSG#\n' +
  2283. u' Please include a bug link\n'),
  2284. u'autogenerated': False,
  2285. u'approval': False,
  2286. u'disapproval': False,
  2287. u'sender': u'reviewer@example.com'
  2288. }
  2289. ]), '')
  2290. ]
  2291. expected_comments_summary = [
  2292. git_cl._CommentSummary(
  2293. message=(
  2294. u'PTAL\n' +
  2295. u'\n' +
  2296. u'codereview.settings\n' +
  2297. u' Base, Line 42: https://chromium-review.googlesource.com/' +
  2298. u'c/1/2/codereview.settings#b42\n' +
  2299. u' I removed this because it is bad\n'),
  2300. date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
  2301. autogenerated=False,
  2302. disapproval=False, approval=False, sender=u'owner@example.com'),
  2303. git_cl._CommentSummary(
  2304. message=(
  2305. u'Patch Set 2: Code-Review+1\n' +
  2306. u'\n' +
  2307. u'/COMMIT_MSG\n' +
  2308. u' PS2, File comment: https://chromium-review.googlesource.com/' +
  2309. u'c/1/2//COMMIT_MSG#\n' +
  2310. u' Please include a bug link\n'),
  2311. date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
  2312. autogenerated=False,
  2313. disapproval=False, approval=False, sender=u'reviewer@example.com'),
  2314. ]
  2315. cl = git_cl.Changelist(
  2316. issue=1, branchref='refs/heads/foo')
  2317. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  2318. self.assertEqual(
  2319. 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
  2320. def test_git_cl_comments_robot_comments(self):
  2321. # git cl comments also fetches robot comments (which are considered a type
  2322. # of autogenerated comment), and unlike other types of comments, only robot
  2323. # comments from the latest patchset are shown.
  2324. self.mockGit.config['remote.origin.url'] = (
  2325. 'https://chromium.googlesource.com/infra/infra')
  2326. gerrit_util.GetChangeDetail.return_value = {
  2327. 'owner': {'email': 'owner@example.com'},
  2328. 'current_revision': 'ba5eba11',
  2329. 'revisions': {
  2330. 'deadbeaf': {
  2331. '_number': 1,
  2332. },
  2333. 'ba5eba11': {
  2334. '_number': 2,
  2335. },
  2336. },
  2337. 'messages': [
  2338. {
  2339. u'_revision_number': 1,
  2340. u'author': {
  2341. u'_account_id': 1111084,
  2342. u'email': u'commit-bot@chromium.org',
  2343. u'name': u'Commit Bot'
  2344. },
  2345. u'date': u'2017-03-15 20:08:45.000000000',
  2346. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  2347. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  2348. u'tag': u'autogenerated:cq:dry-run'
  2349. },
  2350. {
  2351. u'_revision_number': 1,
  2352. u'author': {
  2353. u'_account_id': 123,
  2354. u'email': u'tricium@serviceaccount.com',
  2355. u'name': u'Tricium'
  2356. },
  2357. u'date': u'2017-03-16 20:00:41.000000000',
  2358. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  2359. u'message': u'(1 comment)',
  2360. u'tag': u'autogenerated:tricium',
  2361. },
  2362. {
  2363. u'_revision_number': 1,
  2364. u'author': {
  2365. u'_account_id': 123,
  2366. u'email': u'tricium@serviceaccount.com',
  2367. u'name': u'Tricium'
  2368. },
  2369. u'date': u'2017-03-16 20:00:41.000000000',
  2370. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  2371. u'message': u'(1 comment)',
  2372. u'tag': u'autogenerated:tricium',
  2373. },
  2374. {
  2375. u'_revision_number': 2,
  2376. u'author': {
  2377. u'_account_id': 123,
  2378. u'email': u'tricium@serviceaccount.com',
  2379. u'name': u'reviewer'
  2380. },
  2381. u'date': u'2017-03-17 05:30:37.000000000',
  2382. u'tag': u'autogenerated:tricium',
  2383. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  2384. u'message': u'(1 comment)',
  2385. },
  2386. ]
  2387. }
  2388. self.calls = [
  2389. (('GetChangeComments', 'chromium-review.googlesource.com',
  2390. 'infra%2Finfra~1'), {}),
  2391. (('GetChangeRobotComments', 'chromium-review.googlesource.com',
  2392. 'infra%2Finfra~1'), {
  2393. 'codereview.settings': [
  2394. {
  2395. u'author': {u'email': u'tricium@serviceaccount.com'},
  2396. u'updated': u'2017-03-17 05:30:37.000000000',
  2397. u'robot_run_id': u'5565031076855808',
  2398. u'robot_id': u'Linter/Category',
  2399. u'tag': u'autogenerated:tricium',
  2400. u'patch_set': 2,
  2401. u'side': u'REVISION',
  2402. u'message': u'Linter warning message text',
  2403. u'line': 32,
  2404. },
  2405. ],
  2406. }),
  2407. ]
  2408. expected_comments_summary = [
  2409. git_cl._CommentSummary(date=datetime.datetime(2017, 3, 17, 5, 30, 37),
  2410. message=(
  2411. u'(1 comment)\n\ncodereview.settings\n'
  2412. u' PS2, Line 32: https://chromium-review.googlesource.com/'
  2413. u'c/1/2/codereview.settings#32\n'
  2414. u' Linter warning message text\n'),
  2415. sender=u'tricium@serviceaccount.com',
  2416. autogenerated=True, approval=False, disapproval=False)
  2417. ]
  2418. cl = git_cl.Changelist(
  2419. issue=1, branchref='refs/heads/foo')
  2420. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  2421. def test_get_remote_url_with_mirror(self):
  2422. original_os_path_isdir = os.path.isdir
  2423. def selective_os_path_isdir_mock(path):
  2424. if path == '/cache/this-dir-exists':
  2425. return self._mocked_call('os.path.isdir', path)
  2426. return original_os_path_isdir(path)
  2427. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  2428. url = 'https://chromium.googlesource.com/my/repo'
  2429. self.mockGit.config['remote.origin.url'] = (
  2430. '/cache/this-dir-exists')
  2431. self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
  2432. url)
  2433. self.calls = [
  2434. (('os.path.isdir', '/cache/this-dir-exists'),
  2435. True),
  2436. ]
  2437. cl = git_cl.Changelist(issue=1)
  2438. self.assertEqual(cl.GetRemoteUrl(), url)
  2439. self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
  2440. def test_get_remote_url_non_existing_mirror(self):
  2441. original_os_path_isdir = os.path.isdir
  2442. def selective_os_path_isdir_mock(path):
  2443. if path == '/cache/this-dir-doesnt-exist':
  2444. return self._mocked_call('os.path.isdir', path)
  2445. return original_os_path_isdir(path)
  2446. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  2447. mock.patch('logging.error',
  2448. lambda *a: self._mocked_call('logging.error', *a)).start()
  2449. self.mockGit.config['remote.origin.url'] = (
  2450. '/cache/this-dir-doesnt-exist')
  2451. self.calls = [
  2452. (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
  2453. False),
  2454. (('logging.error',
  2455. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  2456. 'but it doesn\'t exist.', {
  2457. 'remote': 'origin',
  2458. 'branch': 'master',
  2459. 'url': '/cache/this-dir-doesnt-exist'}
  2460. ), None),
  2461. ]
  2462. cl = git_cl.Changelist(issue=1)
  2463. self.assertIsNone(cl.GetRemoteUrl())
  2464. def test_get_remote_url_misconfigured_mirror(self):
  2465. original_os_path_isdir = os.path.isdir
  2466. def selective_os_path_isdir_mock(path):
  2467. if path == '/cache/this-dir-exists':
  2468. return self._mocked_call('os.path.isdir', path)
  2469. return original_os_path_isdir(path)
  2470. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  2471. mock.patch('logging.error',
  2472. lambda *a: self._mocked_call('logging.error', *a)).start()
  2473. self.mockGit.config['remote.origin.url'] = (
  2474. '/cache/this-dir-exists')
  2475. self.calls = [
  2476. (('os.path.isdir', '/cache/this-dir-exists'), True),
  2477. (('logging.error',
  2478. 'Remote "%(remote)s" for branch "%(branch)s" points to '
  2479. '"%(cache_path)s", but it is misconfigured.\n'
  2480. '"%(cache_path)s" must be a git repo and must have a remote named '
  2481. '"%(remote)s" pointing to the git host.', {
  2482. 'remote': 'origin',
  2483. 'cache_path': '/cache/this-dir-exists',
  2484. 'branch': 'master'}
  2485. ), None),
  2486. ]
  2487. cl = git_cl.Changelist(issue=1)
  2488. self.assertIsNone(cl.GetRemoteUrl())
  2489. def test_gerrit_change_identifier_with_project(self):
  2490. self.mockGit.config['remote.origin.url'] = (
  2491. 'https://chromium.googlesource.com/a/my/repo.git/')
  2492. cl = git_cl.Changelist(issue=123456)
  2493. self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
  2494. def test_gerrit_change_identifier_without_project(self):
  2495. mock.patch('logging.error',
  2496. lambda *a: self._mocked_call('logging.error', *a)).start()
  2497. self.calls = [
  2498. (('logging.error',
  2499. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  2500. 'but it doesn\'t exist.', {
  2501. 'remote': 'origin',
  2502. 'branch': 'master',
  2503. 'url': ''}
  2504. ), None),
  2505. ]
  2506. cl = git_cl.Changelist(issue=123456)
  2507. self.assertEqual(cl._GerritChangeIdentifier(), '123456')
  2508. class CMDTestCaseBase(unittest.TestCase):
  2509. _STATUSES = [
  2510. 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
  2511. 'INFRA_FAILURE', 'CANCELED',
  2512. ]
  2513. _CHANGE_DETAIL = {
  2514. 'project': 'depot_tools',
  2515. 'status': 'OPEN',
  2516. 'owner': {'email': 'owner@e.mail'},
  2517. 'current_revision': 'beeeeeef',
  2518. 'revisions': {
  2519. 'deadbeaf': {'_number': 6},
  2520. 'beeeeeef': {
  2521. '_number': 7,
  2522. 'fetch': {'http': {
  2523. 'url': 'https://chromium.googlesource.com/depot_tools',
  2524. 'ref': 'refs/changes/56/123456/7'
  2525. }},
  2526. },
  2527. },
  2528. }
  2529. _DEFAULT_RESPONSE = {
  2530. 'builds': [{
  2531. 'id': str(100 + idx),
  2532. 'builder': {
  2533. 'project': 'chromium',
  2534. 'bucket': 'try',
  2535. 'builder': 'bot_' + status.lower(),
  2536. },
  2537. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  2538. 'tags': [],
  2539. 'status': status,
  2540. } for idx, status in enumerate(_STATUSES)]
  2541. }
  2542. def setUp(self):
  2543. super(CMDTestCaseBase, self).setUp()
  2544. mock.patch('git_cl.sys.stdout', StringIO()).start()
  2545. mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
  2546. mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
  2547. mock.patch(
  2548. 'git_cl.Changelist.GetCodereviewServer',
  2549. return_value='https://chromium-review.googlesource.com').start()
  2550. mock.patch(
  2551. 'git_cl.Changelist._GetGerritHost',
  2552. return_value='chromium-review.googlesource.com').start()
  2553. mock.patch(
  2554. 'git_cl.Changelist.GetMostRecentPatchset',
  2555. return_value=7).start()
  2556. mock.patch(
  2557. 'git_cl.Changelist.GetRemoteUrl',
  2558. return_value='https://chromium.googlesource.com/depot_tools').start()
  2559. mock.patch(
  2560. 'auth.Authenticator',
  2561. return_value=AuthenticatorMock()).start()
  2562. mock.patch(
  2563. 'gerrit_util.GetChangeDetail',
  2564. return_value=self._CHANGE_DETAIL).start()
  2565. mock.patch(
  2566. 'git_cl._call_buildbucket',
  2567. return_value = self._DEFAULT_RESPONSE).start()
  2568. mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
  2569. self.addCleanup(mock.patch.stopall)
  2570. class CMDTryResultsTestCase(CMDTestCaseBase):
  2571. _DEFAULT_REQUEST = {
  2572. 'predicate': {
  2573. "gerritChanges": [{
  2574. "project": "depot_tools",
  2575. "host": "chromium-review.googlesource.com",
  2576. "patchset": 7,
  2577. "change": 123456,
  2578. }],
  2579. },
  2580. 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
  2581. ',builds.*.createTime,builds.*.tags'),
  2582. }
  2583. def testNoJobs(self):
  2584. git_cl._call_buildbucket.return_value = {}
  2585. self.assertEqual(0, git_cl.main(['try-results']))
  2586. self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
  2587. git_cl._call_buildbucket.assert_called_once_with(
  2588. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  2589. self._DEFAULT_REQUEST)
  2590. def testPrintToStdout(self):
  2591. self.assertEqual(0, git_cl.main(['try-results']))
  2592. self.assertEqual([
  2593. 'Successes:',
  2594. ' bot_success https://ci.chromium.org/b/103',
  2595. 'Infra Failures:',
  2596. ' bot_infra_failure https://ci.chromium.org/b/105',
  2597. 'Failures:',
  2598. ' bot_failure https://ci.chromium.org/b/104',
  2599. 'Canceled:',
  2600. ' bot_canceled ',
  2601. 'Started:',
  2602. ' bot_started https://ci.chromium.org/b/102',
  2603. 'Scheduled:',
  2604. ' bot_scheduled id=101',
  2605. 'Other:',
  2606. ' bot_status_unspecified id=100',
  2607. 'Total: 7 tryjobs',
  2608. ], sys.stdout.getvalue().splitlines())
  2609. git_cl._call_buildbucket.assert_called_once_with(
  2610. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  2611. self._DEFAULT_REQUEST)
  2612. def testPrintToStdoutWithMasters(self):
  2613. self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
  2614. self.assertEqual([
  2615. 'Successes:',
  2616. ' try bot_success https://ci.chromium.org/b/103',
  2617. 'Infra Failures:',
  2618. ' try bot_infra_failure https://ci.chromium.org/b/105',
  2619. 'Failures:',
  2620. ' try bot_failure https://ci.chromium.org/b/104',
  2621. 'Canceled:',
  2622. ' try bot_canceled ',
  2623. 'Started:',
  2624. ' try bot_started https://ci.chromium.org/b/102',
  2625. 'Scheduled:',
  2626. ' try bot_scheduled id=101',
  2627. 'Other:',
  2628. ' try bot_status_unspecified id=100',
  2629. 'Total: 7 tryjobs',
  2630. ], sys.stdout.getvalue().splitlines())
  2631. git_cl._call_buildbucket.assert_called_once_with(
  2632. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  2633. self._DEFAULT_REQUEST)
  2634. @mock.patch('git_cl.write_json')
  2635. def testWriteToJson(self, mockJsonDump):
  2636. self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
  2637. git_cl._call_buildbucket.assert_called_once_with(
  2638. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  2639. self._DEFAULT_REQUEST)
  2640. mockJsonDump.assert_called_once_with(
  2641. 'file.json', self._DEFAULT_RESPONSE['builds'])
  2642. def test_filter_failed_for_one_simple(self):
  2643. self.assertEqual({}, git_cl._filter_failed_for_retry([]))
  2644. self.assertEqual({
  2645. 'chromium/try': {
  2646. 'bot_failure': [],
  2647. 'bot_infra_failure': []
  2648. },
  2649. }, git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
  2650. def test_filter_failed_for_retry_many_builds(self):
  2651. def _build(name, created_sec, status, experimental=False):
  2652. assert 0 <= created_sec < 100, created_sec
  2653. b = {
  2654. 'id': 112112,
  2655. 'builder': {
  2656. 'project': 'chromium',
  2657. 'bucket': 'try',
  2658. 'builder': name,
  2659. },
  2660. 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
  2661. 'status': status,
  2662. 'tags': [],
  2663. }
  2664. if experimental:
  2665. b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
  2666. return b
  2667. builds = [
  2668. _build('flaky-last-green', 1, 'FAILURE'),
  2669. _build('flaky-last-green', 2, 'SUCCESS'),
  2670. _build('flaky', 1, 'SUCCESS'),
  2671. _build('flaky', 2, 'FAILURE'),
  2672. _build('running', 1, 'FAILED'),
  2673. _build('running', 2, 'SCHEDULED'),
  2674. _build('yep-still-running', 1, 'STARTED'),
  2675. _build('yep-still-running', 2, 'FAILURE'),
  2676. _build('cq-experimental', 1, 'SUCCESS', experimental=True),
  2677. _build('cq-experimental', 2, 'FAILURE', experimental=True),
  2678. # Simulate experimental in CQ builder, which developer decided
  2679. # to retry manually which resulted in 2nd build non-experimental.
  2680. _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
  2681. _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
  2682. ]
  2683. builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
  2684. self.assertEqual({
  2685. 'chromium/try': {
  2686. 'flaky': [],
  2687. 'sometimes-experimental': []
  2688. },
  2689. }, git_cl._filter_failed_for_retry(builds))
  2690. class CMDTryTestCase(CMDTestCaseBase):
  2691. @mock.patch('git_cl.Changelist.SetCQState')
  2692. @mock.patch('git_cl._get_bucket_map', return_value={})
  2693. def testSetCQDryRunByDefault(self, _mockGetBucketMap, mockSetCQState):
  2694. mockSetCQState.return_value = 0
  2695. self.assertEqual(0, git_cl.main(['try']))
  2696. git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
  2697. self.assertEqual(
  2698. sys.stdout.getvalue(),
  2699. 'Scheduling CQ dry run on: '
  2700. 'https://chromium-review.googlesource.com/123456\n')
  2701. @mock.patch('git_cl._call_buildbucket')
  2702. def testScheduleOnBuildbucket(self, mockCallBuildbucket):
  2703. mockCallBuildbucket.return_value = {}
  2704. self.assertEqual(0, git_cl.main([
  2705. 'try', '-B', 'luci.chromium.try', '-b', 'win',
  2706. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  2707. self.assertIn(
  2708. 'Scheduling jobs on:\nBucket: luci.chromium.try',
  2709. git_cl.sys.stdout.getvalue())
  2710. expected_request = {
  2711. "requests": [{
  2712. "scheduleBuild": {
  2713. "requestId": "uuid4",
  2714. "builder": {
  2715. "project": "chromium",
  2716. "builder": "win",
  2717. "bucket": "try",
  2718. },
  2719. "gerritChanges": [{
  2720. "project": "depot_tools",
  2721. "host": "chromium-review.googlesource.com",
  2722. "patchset": 7,
  2723. "change": 123456,
  2724. }],
  2725. "properties": {
  2726. "category": "git_cl_try",
  2727. "json": [{"a": 1}, None],
  2728. "key": "val",
  2729. },
  2730. "tags": [
  2731. {"value": "win", "key": "builder"},
  2732. {"value": "git_cl_try", "key": "user_agent"},
  2733. ],
  2734. },
  2735. }],
  2736. }
  2737. mockCallBuildbucket.assert_called_with(
  2738. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  2739. @mock.patch('git_cl._call_buildbucket')
  2740. def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
  2741. mockCallBuildbucket.return_value = {}
  2742. self.assertEqual(0, git_cl.main([
  2743. 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
  2744. '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
  2745. '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
  2746. self.assertIn(
  2747. 'Scheduling jobs on:\nBucket: luci.chromium.try',
  2748. git_cl.sys.stdout.getvalue())
  2749. expected_request = {
  2750. "requests": [{
  2751. "scheduleBuild": {
  2752. "requestId": "uuid4",
  2753. "builder": {
  2754. "project": "chromium",
  2755. "builder": "linux",
  2756. "bucket": "try",
  2757. },
  2758. "gerritChanges": [{
  2759. "project": "depot_tools",
  2760. "host": "chromium-review.googlesource.com",
  2761. "patchset": 7,
  2762. "change": 123456,
  2763. }],
  2764. "properties": {
  2765. "category": "git_cl_try",
  2766. "json": [{"a": 1}, None],
  2767. "key": "val",
  2768. },
  2769. "tags": [
  2770. {"value": "linux", "key": "builder"},
  2771. {"value": "git_cl_try", "key": "user_agent"},
  2772. ],
  2773. "gitilesCommit": {
  2774. "host": "chromium-review.googlesource.com",
  2775. "project": "depot_tools",
  2776. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  2777. }
  2778. },
  2779. },
  2780. {
  2781. "scheduleBuild": {
  2782. "requestId": "uuid4",
  2783. "builder": {
  2784. "project": "chromium",
  2785. "builder": "win",
  2786. "bucket": "try",
  2787. },
  2788. "gerritChanges": [{
  2789. "project": "depot_tools",
  2790. "host": "chromium-review.googlesource.com",
  2791. "patchset": 7,
  2792. "change": 123456,
  2793. }],
  2794. "properties": {
  2795. "category": "git_cl_try",
  2796. "json": [{"a": 1}, None],
  2797. "key": "val",
  2798. },
  2799. "tags": [
  2800. {"value": "win", "key": "builder"},
  2801. {"value": "git_cl_try", "key": "user_agent"},
  2802. ],
  2803. "gitilesCommit": {
  2804. "host": "chromium-review.googlesource.com",
  2805. "project": "depot_tools",
  2806. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  2807. }
  2808. },
  2809. }],
  2810. }
  2811. mockCallBuildbucket.assert_called_with(
  2812. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  2813. def testScheduleOnBuildbucket_WrongBucket(self):
  2814. self.assertEqual(0, git_cl.main([
  2815. 'try', '-B', 'not-a-bucket', '-b', 'win',
  2816. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  2817. self.assertIn(
  2818. 'WARNING Could not parse bucket "not-a-bucket". Skipping.',
  2819. git_cl.sys.stdout.getvalue())
  2820. @mock.patch('git_cl._call_buildbucket')
  2821. @mock.patch('git_cl.fetch_try_jobs')
  2822. def testScheduleOnBuildbucketRetryFailed(
  2823. self, mockFetchTryJobs, mockCallBuildbucket):
  2824. git_cl.fetch_try_jobs.side_effect = lambda *_, **kw: {
  2825. 7: [],
  2826. 6: [{
  2827. 'id': 112112,
  2828. 'builder': {
  2829. 'project': 'chromium',
  2830. 'bucket': 'try',
  2831. 'builder': 'linux',},
  2832. 'createTime': '2019-10-09T08:00:01.854286Z',
  2833. 'tags': [],
  2834. 'status': 'FAILURE',}],}[kw['patchset']]
  2835. mockCallBuildbucket.return_value = {}
  2836. self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
  2837. self.assertIn(
  2838. 'Scheduling jobs on:\nBucket: chromium/try',
  2839. git_cl.sys.stdout.getvalue())
  2840. expected_request = {
  2841. "requests": [{
  2842. "scheduleBuild": {
  2843. "requestId": "uuid4",
  2844. "builder": {
  2845. "project": "chromium",
  2846. "bucket": "try",
  2847. "builder": "linux",
  2848. },
  2849. "gerritChanges": [{
  2850. "project": "depot_tools",
  2851. "host": "chromium-review.googlesource.com",
  2852. "patchset": 7,
  2853. "change": 123456,
  2854. }],
  2855. "properties": {
  2856. "category": "git_cl_try",
  2857. },
  2858. "tags": [
  2859. {"value": "linux", "key": "builder"},
  2860. {"value": "git_cl_try", "key": "user_agent"},
  2861. {"value": "1", "key": "retry_failed"},
  2862. ],
  2863. },
  2864. }],
  2865. }
  2866. mockCallBuildbucket.assert_called_with(
  2867. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  2868. def test_parse_bucket(self):
  2869. test_cases = [
  2870. {
  2871. 'bucket': 'chromium/try',
  2872. 'result': ('chromium', 'try'),
  2873. },
  2874. {
  2875. 'bucket': 'luci.chromium.try',
  2876. 'result': ('chromium', 'try'),
  2877. 'has_warning': True,
  2878. },
  2879. {
  2880. 'bucket': 'skia.primary',
  2881. 'result': ('skia', 'skia.primary'),
  2882. 'has_warning': True,
  2883. },
  2884. {
  2885. 'bucket': 'not-a-bucket',
  2886. 'result': (None, None),
  2887. },
  2888. ]
  2889. for test_case in test_cases:
  2890. git_cl.sys.stdout.truncate(0)
  2891. self.assertEqual(
  2892. test_case['result'], git_cl._parse_bucket(test_case['bucket']))
  2893. if test_case.get('has_warning'):
  2894. expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
  2895. test_case['result'])
  2896. self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
  2897. class CMDUploadTestCase(CMDTestCaseBase):
  2898. def setUp(self):
  2899. super(CMDUploadTestCase, self).setUp()
  2900. mock.patch('git_cl.fetch_try_jobs').start()
  2901. mock.patch('git_cl._trigger_try_jobs', return_value={}).start()
  2902. mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
  2903. mock.patch('git_cl.Settings.GetIsGerrit', return_value=True).start()
  2904. self.addCleanup(mock.patch.stopall)
  2905. def testWarmUpChangeDetailCache(self):
  2906. self.assertEqual(0, git_cl.main(['upload']))
  2907. gerrit_util.GetChangeDetail.assert_called_once_with(
  2908. 'chromium-review.googlesource.com', 'depot_tools~123456',
  2909. frozenset([
  2910. 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
  2911. 'CURRENT_COMMIT']))
  2912. def testUploadRetryFailed(self):
  2913. # This test mocks out the actual upload part, and just asserts that after
  2914. # upload, if --retry-failed is added, then the tool will fetch try jobs
  2915. # from the previous patchset and trigger the right builders on the latest
  2916. # patchset.
  2917. git_cl.fetch_try_jobs.side_effect = [
  2918. # Latest patchset: No builds.
  2919. [],
  2920. # Patchset before latest: Some builds.
  2921. [{
  2922. 'id': str(100 + idx),
  2923. 'builder': {
  2924. 'project': 'chromium',
  2925. 'bucket': 'try',
  2926. 'builder': 'bot_' + status.lower(),
  2927. },
  2928. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  2929. 'tags': [],
  2930. 'status': status,
  2931. } for idx, status in enumerate(self._STATUSES)],
  2932. ]
  2933. self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
  2934. self.assertEqual([
  2935. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
  2936. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
  2937. ], git_cl.fetch_try_jobs.mock_calls)
  2938. expected_buckets = {
  2939. 'chromium/try': {'bot_failure': [], 'bot_infra_failure': []},
  2940. }
  2941. git_cl._trigger_try_jobs.assert_called_once_with(
  2942. mock.ANY, expected_buckets, mock.ANY, 8)
  2943. class CMDFormatTestCase(unittest.TestCase):
  2944. def setUp(self):
  2945. super(CMDFormatTestCase, self).setUp()
  2946. mock.patch('git_cl.RunCommand').start()
  2947. mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
  2948. mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
  2949. mock.patch('git_cl.settings').start()
  2950. self._top_dir = tempfile.mkdtemp()
  2951. self.addCleanup(mock.patch.stopall)
  2952. def tearDown(self):
  2953. shutil.rmtree(self._top_dir)
  2954. super(CMDFormatTestCase, self).tearDown()
  2955. def _make_temp_file(self, fname, contents):
  2956. with open(os.path.join(self._top_dir, fname), 'w') as tf:
  2957. tf.write('\n'.join(contents))
  2958. def _make_yapfignore(self, contents):
  2959. self._make_temp_file('.yapfignore', contents)
  2960. def _check_yapf_filtering(self, files, expected):
  2961. self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
  2962. files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
  2963. def testClangFormatDiffFull(self):
  2964. self._make_temp_file('test.cc', ['// test'])
  2965. git_cl.settings.GetFormatFullByDefault.return_value = False
  2966. diff_file = [os.path.join(self._top_dir, 'test.cc')]
  2967. mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
  2968. # Diff
  2969. git_cl.RunCommand.return_value = ' // test'
  2970. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  2971. self._top_dir, 'HEAD')
  2972. self.assertEqual(2, return_value)
  2973. # No diff
  2974. git_cl.RunCommand.return_value = '// test'
  2975. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  2976. self._top_dir, 'HEAD')
  2977. self.assertEqual(0, return_value)
  2978. def testClangFormatDiff(self):
  2979. git_cl.settings.GetFormatFullByDefault.return_value = False
  2980. mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
  2981. # Diff
  2982. git_cl.RunCommand.return_value = 'error'
  2983. return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
  2984. 'HEAD')
  2985. self.assertEqual(2, return_value)
  2986. # No diff
  2987. git_cl.RunCommand.return_value = ''
  2988. return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
  2989. 'HEAD')
  2990. self.assertEqual(0, return_value)
  2991. def testYapfignoreExplicit(self):
  2992. self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
  2993. files = [
  2994. 'bar.py',
  2995. 'foo/bar.py',
  2996. 'foo/baz.py',
  2997. 'foo/bar/baz.py',
  2998. 'foo/bar/foobar.py',
  2999. ]
  3000. expected = [
  3001. 'bar.py',
  3002. 'foo/baz.py',
  3003. 'foo/bar/foobar.py',
  3004. ]
  3005. self._check_yapf_filtering(files, expected)
  3006. def testYapfignoreSingleWildcards(self):
  3007. self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
  3008. files = [
  3009. 'bar.py', # Matched by *bar.py.
  3010. 'bar.txt',
  3011. 'foobar.py', # Matched by *bar.py, foo*.
  3012. 'foobar.txt', # Matched by foo*.
  3013. 'bazbar.py', # Matched by *bar.py, baz*.py.
  3014. 'bazbar.txt',
  3015. 'foo/baz.txt', # Matched by foo*.
  3016. 'bar/bar.py', # Matched by *bar.py.
  3017. 'baz/foo.py', # Matched by baz*.py, foo*.
  3018. 'baz/foo.txt',
  3019. ]
  3020. expected = [
  3021. 'bar.txt',
  3022. 'bazbar.txt',
  3023. 'baz/foo.txt',
  3024. ]
  3025. self._check_yapf_filtering(files, expected)
  3026. def testYapfignoreMultiplewildcards(self):
  3027. self._make_yapfignore(['*bar*', '*foo*baz.txt'])
  3028. files = [
  3029. 'bar.py', # Matched by *bar*.
  3030. 'bar.txt', # Matched by *bar*.
  3031. 'abar.py', # Matched by *bar*.
  3032. 'foobaz.txt', # Matched by *foo*baz.txt.
  3033. 'foobaz.py',
  3034. 'afoobaz.txt', # Matched by *foo*baz.txt.
  3035. ]
  3036. expected = [
  3037. 'foobaz.py',
  3038. ]
  3039. self._check_yapf_filtering(files, expected)
  3040. def testYapfignoreComments(self):
  3041. self._make_yapfignore(['test.py', '#test2.py'])
  3042. files = [
  3043. 'test.py',
  3044. 'test2.py',
  3045. ]
  3046. expected = [
  3047. 'test2.py',
  3048. ]
  3049. self._check_yapf_filtering(files, expected)
  3050. def testYapfignoreBlankLines(self):
  3051. self._make_yapfignore(['test.py', '', '', 'test2.py'])
  3052. files = [
  3053. 'test.py',
  3054. 'test2.py',
  3055. 'test3.py',
  3056. ]
  3057. expected = [
  3058. 'test3.py',
  3059. ]
  3060. self._check_yapf_filtering(files, expected)
  3061. def testYapfignoreWhitespace(self):
  3062. self._make_yapfignore([' test.py '])
  3063. files = [
  3064. 'test.py',
  3065. 'test2.py',
  3066. ]
  3067. expected = [
  3068. 'test2.py',
  3069. ]
  3070. self._check_yapf_filtering(files, expected)
  3071. def testYapfignoreNoFiles(self):
  3072. self._make_yapfignore(['test.py'])
  3073. self._check_yapf_filtering([], [])
  3074. def testYapfignoreMissingYapfignore(self):
  3075. files = [
  3076. 'test.py',
  3077. ]
  3078. expected = [
  3079. 'test.py',
  3080. ]
  3081. self._check_yapf_filtering(files, expected)
  3082. if __name__ == '__main__':
  3083. logging.basicConfig(
  3084. level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
  3085. unittest.main()