git_cl_test.py 194 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026202720282029203020312032203320342035203620372038203920402041204220432044204520462047204820492050205120522053205420552056205720582059206020612062206320642065206620672068206920702071207220732074207520762077207820792080208120822083208420852086208720882089209020912092209320942095209620972098209921002101210221032104210521062107210821092110211121122113211421152116211721182119212021212122212321242125212621272128212921302131213221332134213521362137213821392140214121422143214421452146214721482149215021512152215321542155215621572158215921602161216221632164216521662167216821692170217121722173217421752176217721782179218021812182218321842185218621872188218921902191219221932194219521962197219821992200220122022203220422052206220722082209221022112212221322142215221622172218221922202221222222232224222522262227222822292230223122322233223422352236223722382239224022412242224322442245224622472248224922502251225222532254225522562257225822592260226122622263226422652266226722682269227022712272227322742275227622772278227922802281228222832284228522862287228822892290229122922293229422952296229722982299230023012302230323042305230623072308230923102311231223132314231523162317231823192320232123222323232423252326232723282329233023312332233323342335233623372338233923402341234223432344234523462347234823492350235123522353235423552356235723582359236023612362236323642365236623672368236923702371237223732374237523762377237823792380238123822383238423852386238723882389239023912392239323942395239623972398239924002401240224032404240524062407240824092410241124122413241424152416241724182419242024212422242324242425242624272428242924302431243224332434243524362437243824392440244124422443244424452446244724482449245024512452245324542455245624572458245924602461246224632464246524662467246824692470247124722473247424752476247724782479248024812482248324842485248624872488248924902491249224932494249524962497249824992500250125022503250425052506250725082509251025112512251325142515251625172518251925202521252225232524252525262527252825292530253125322533253425352536253725382539254025412542254325442545254625472548254925502551255225532554255525562557255825592560256125622563256425652566256725682569257025712572257325742575257625772578257925802581258225832584258525862587258825892590259125922593259425952596259725982599260026012602260326042605260626072608260926102611261226132614261526162617261826192620262126222623262426252626262726282629263026312632263326342635263626372638263926402641264226432644264526462647264826492650265126522653265426552656265726582659266026612662266326642665266626672668266926702671267226732674267526762677267826792680268126822683268426852686268726882689269026912692269326942695269626972698269927002701270227032704270527062707270827092710271127122713271427152716271727182719272027212722272327242725272627272728272927302731273227332734273527362737273827392740274127422743274427452746274727482749275027512752275327542755275627572758275927602761276227632764276527662767276827692770277127722773277427752776277727782779278027812782278327842785278627872788278927902791279227932794279527962797279827992800280128022803280428052806280728082809281028112812281328142815281628172818281928202821282228232824282528262827282828292830283128322833283428352836283728382839284028412842284328442845284628472848284928502851285228532854285528562857285828592860286128622863286428652866286728682869287028712872287328742875287628772878287928802881288228832884288528862887288828892890289128922893289428952896289728982899290029012902290329042905290629072908290929102911291229132914291529162917291829192920292129222923292429252926292729282929293029312932293329342935293629372938293929402941294229432944294529462947294829492950295129522953295429552956295729582959296029612962296329642965296629672968296929702971297229732974297529762977297829792980298129822983298429852986298729882989299029912992299329942995299629972998299930003001300230033004300530063007300830093010301130123013301430153016301730183019302030213022302330243025302630273028302930303031303230333034303530363037303830393040304130423043304430453046304730483049305030513052305330543055305630573058305930603061306230633064306530663067306830693070307130723073307430753076307730783079308030813082308330843085308630873088308930903091309230933094309530963097309830993100310131023103310431053106310731083109311031113112311331143115311631173118311931203121312231233124312531263127312831293130313131323133313431353136313731383139314031413142314331443145314631473148314931503151315231533154315531563157315831593160316131623163316431653166316731683169317031713172317331743175317631773178317931803181318231833184318531863187318831893190319131923193319431953196319731983199320032013202320332043205320632073208320932103211321232133214321532163217321832193220322132223223322432253226322732283229323032313232323332343235323632373238323932403241324232433244324532463247324832493250325132523253325432553256325732583259326032613262326332643265326632673268326932703271327232733274327532763277327832793280328132823283328432853286328732883289329032913292329332943295329632973298329933003301330233033304330533063307330833093310331133123313331433153316331733183319332033213322332333243325332633273328332933303331333233333334333533363337333833393340334133423343334433453346334733483349335033513352335333543355335633573358335933603361336233633364336533663367336833693370337133723373337433753376337733783379338033813382338333843385338633873388338933903391339233933394339533963397339833993400340134023403340434053406340734083409341034113412341334143415341634173418341934203421342234233424342534263427342834293430343134323433343434353436343734383439344034413442344334443445344634473448344934503451345234533454345534563457345834593460346134623463346434653466346734683469347034713472347334743475347634773478347934803481348234833484348534863487348834893490349134923493349434953496349734983499350035013502350335043505350635073508350935103511351235133514351535163517351835193520352135223523352435253526352735283529353035313532353335343535353635373538353935403541354235433544354535463547354835493550355135523553355435553556355735583559356035613562356335643565356635673568356935703571357235733574357535763577357835793580358135823583358435853586358735883589359035913592359335943595359635973598359936003601360236033604360536063607360836093610361136123613361436153616361736183619362036213622362336243625362636273628362936303631363236333634363536363637363836393640364136423643364436453646364736483649365036513652365336543655365636573658365936603661366236633664366536663667366836693670367136723673367436753676367736783679368036813682368336843685368636873688368936903691369236933694369536963697369836993700370137023703370437053706370737083709371037113712371337143715371637173718371937203721372237233724372537263727372837293730373137323733373437353736373737383739374037413742374337443745374637473748374937503751375237533754375537563757375837593760376137623763376437653766376737683769377037713772377337743775377637773778377937803781378237833784378537863787378837893790379137923793379437953796379737983799380038013802380338043805380638073808380938103811381238133814381538163817381838193820382138223823382438253826382738283829383038313832383338343835383638373838383938403841384238433844384538463847384838493850385138523853385438553856385738583859386038613862386338643865386638673868386938703871387238733874387538763877387838793880388138823883388438853886388738883889389038913892389338943895389638973898389939003901390239033904390539063907390839093910391139123913391439153916391739183919392039213922392339243925392639273928392939303931393239333934393539363937393839393940394139423943394439453946394739483949395039513952395339543955395639573958395939603961396239633964396539663967396839693970397139723973397439753976397739783979398039813982398339843985398639873988398939903991399239933994399539963997399839994000400140024003400440054006400740084009401040114012401340144015401640174018401940204021402240234024402540264027402840294030403140324033403440354036403740384039404040414042404340444045404640474048404940504051405240534054405540564057405840594060406140624063406440654066406740684069407040714072407340744075407640774078407940804081408240834084408540864087408840894090409140924093409440954096409740984099410041014102410341044105410641074108410941104111411241134114411541164117411841194120412141224123412441254126412741284129413041314132413341344135413641374138413941404141414241434144414541464147414841494150415141524153415441554156415741584159416041614162416341644165416641674168416941704171417241734174417541764177417841794180418141824183418441854186418741884189419041914192419341944195419641974198419942004201420242034204420542064207420842094210421142124213421442154216421742184219422042214222422342244225422642274228422942304231423242334234423542364237423842394240424142424243424442454246424742484249425042514252425342544255425642574258425942604261426242634264426542664267426842694270427142724273427442754276427742784279428042814282428342844285428642874288428942904291429242934294429542964297429842994300430143024303430443054306430743084309431043114312431343144315431643174318431943204321432243234324432543264327432843294330433143324333433443354336433743384339434043414342434343444345434643474348434943504351435243534354435543564357435843594360436143624363436443654366436743684369437043714372437343744375437643774378437943804381438243834384438543864387438843894390439143924393439443954396439743984399440044014402440344044405440644074408440944104411441244134414441544164417441844194420442144224423442444254426442744284429443044314432443344344435443644374438443944404441444244434444444544464447444844494450445144524453445444554456445744584459446044614462446344644465446644674468446944704471447244734474447544764477447844794480448144824483448444854486448744884489449044914492449344944495449644974498449945004501450245034504450545064507450845094510451145124513451445154516451745184519452045214522452345244525452645274528452945304531453245334534453545364537453845394540454145424543454445454546454745484549455045514552455345544555455645574558455945604561456245634564456545664567456845694570457145724573457445754576457745784579458045814582458345844585458645874588458945904591459245934594459545964597459845994600460146024603460446054606460746084609461046114612461346144615461646174618461946204621462246234624462546264627462846294630463146324633463446354636463746384639464046414642464346444645464646474648464946504651465246534654465546564657465846594660466146624663466446654666466746684669467046714672467346744675467646774678467946804681468246834684468546864687468846894690469146924693469446954696469746984699470047014702470347044705470647074708470947104711471247134714471547164717471847194720472147224723472447254726472747284729473047314732473347344735473647374738473947404741474247434744474547464747474847494750475147524753475447554756475747584759476047614762476347644765476647674768476947704771477247734774477547764777477847794780478147824783478447854786478747884789479047914792479347944795479647974798479948004801480248034804480548064807480848094810481148124813481448154816481748184819482048214822482348244825482648274828482948304831483248334834483548364837483848394840484148424843484448454846484748484849485048514852485348544855485648574858485948604861486248634864486548664867486848694870487148724873487448754876487748784879488048814882488348844885488648874888488948904891489248934894489548964897489848994900490149024903490449054906490749084909491049114912491349144915491649174918491949204921492249234924492549264927492849294930493149324933493449354936493749384939494049414942494349444945494649474948494949504951495249534954495549564957495849594960496149624963496449654966496749684969497049714972497349744975497649774978497949804981498249834984498549864987498849894990499149924993499449954996499749984999500050015002500350045005500650075008500950105011501250135014501550165017501850195020502150225023502450255026502750285029503050315032503350345035503650375038503950405041504250435044504550465047504850495050505150525053505450555056505750585059506050615062506350645065506650675068506950705071507250735074507550765077507850795080508150825083508450855086508750885089509050915092509350945095509650975098509951005101510251035104510551065107510851095110511151125113511451155116511751185119512051215122512351245125512651275128512951305131513251335134513551365137513851395140514151425143514451455146514751485149515051515152515351545155515651575158515951605161516251635164516551665167516851695170517151725173517451755176517751785179518051815182518351845185518651875188518951905191519251935194519551965197519851995200520152025203520452055206520752085209521052115212521352145215521652175218521952205221522252235224522552265227522852295230523152325233523452355236523752385239524052415242524352445245524652475248524952505251525252535254525552565257525852595260526152625263526452655266526752685269527052715272527352745275527652775278527952805281528252835284528552865287
  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 multiprocessing
  13. import optparse
  14. import os
  15. import pprint
  16. import shutil
  17. import sys
  18. import tempfile
  19. import unittest
  20. if sys.version_info.major == 2:
  21. from StringIO import StringIO
  22. import mock
  23. else:
  24. from io import StringIO
  25. from unittest import mock
  26. sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
  27. import metrics
  28. import metrics_utils
  29. # We have to disable monitoring before importing git_cl.
  30. metrics_utils.COLLECT_METRICS = False
  31. import clang_format
  32. import contextlib
  33. import gclient_utils
  34. import gerrit_util
  35. import git_cl
  36. import git_common
  37. import git_footers
  38. import git_new_branch
  39. import owners_client
  40. import scm
  41. import subprocess2
  42. NETRC_FILENAME = '_netrc' if sys.platform == 'win32' else '.netrc'
  43. def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
  44. return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
  45. CERR1 = callError(1)
  46. class TemporaryFileMock(object):
  47. def __init__(self):
  48. self.suffix = 0
  49. @contextlib.contextmanager
  50. def __call__(self):
  51. self.suffix += 1
  52. yield '/tmp/fake-temp' + str(self.suffix)
  53. class ChangelistMock(object):
  54. # A class variable so we can access it when we don't have access to the
  55. # instance that's being set.
  56. desc = ''
  57. def __init__(self, gerrit_change=None, use_python3=False, **kwargs):
  58. self._gerrit_change = gerrit_change
  59. self._use_python3 = use_python3
  60. def GetIssue(self):
  61. return 1
  62. def FetchDescription(self):
  63. return ChangelistMock.desc
  64. def UpdateDescription(self, desc, force=False):
  65. ChangelistMock.desc = desc
  66. def GetGerritChange(self, patchset=None, **kwargs):
  67. del patchset
  68. return self._gerrit_change
  69. def GetRemoteBranch(self):
  70. return ('origin', 'refs/remotes/origin/main')
  71. class GitMocks(object):
  72. def __init__(self, config=None, branchref=None):
  73. self.branchref = branchref or 'refs/heads/main'
  74. self.config = config or {}
  75. def GetBranchRef(self, _root):
  76. return self.branchref
  77. def NewBranch(self, branchref):
  78. self.branchref = branchref
  79. def GetConfig(self, root, key, default=None):
  80. if root != '':
  81. key = '%s:%s' % (root, key)
  82. return self.config.get(key, default)
  83. def SetConfig(self, root, key, value=None):
  84. if root != '':
  85. key = '%s:%s' % (root, key)
  86. if value:
  87. self.config[key] = value
  88. return
  89. if key not in self.config:
  90. raise CERR1
  91. del self.config[key]
  92. class WatchlistsMock(object):
  93. def __init__(self, _):
  94. pass
  95. @staticmethod
  96. def GetWatchersForPaths(_):
  97. return ['joe@example.com']
  98. class CodereviewSettingsFileMock(object):
  99. def __init__(self):
  100. pass
  101. # pylint: disable=no-self-use
  102. def read(self):
  103. return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
  104. 'GERRIT_HOST: True\n')
  105. class AuthenticatorMock(object):
  106. def __init__(self, *_args):
  107. pass
  108. def has_cached_credentials(self):
  109. return True
  110. def authorize(self, http):
  111. return http
  112. def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
  113. """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
  114. Usage:
  115. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  116. CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
  117. OR
  118. >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
  119. CookiesAuthenticatorMockFactory(
  120. same_auth=('user', '', 'pass'))
  121. """
  122. class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
  123. def __init__(self): # pylint: disable=super-init-not-called
  124. # Intentionally not calling super() because it reads actual cookie files.
  125. pass
  126. @classmethod
  127. def get_gitcookies_path(cls):
  128. return os.path.join('~', '.gitcookies')
  129. @classmethod
  130. def get_netrc_path(cls):
  131. return os.path.join('~', NETRC_FILENAME)
  132. def _get_auth_for_host(self, host):
  133. if same_auth:
  134. return same_auth
  135. return (hosts_with_creds or {}).get(host)
  136. return CookiesAuthenticatorMock
  137. class MockChangelistWithBranchAndIssue():
  138. def __init__(self, branch, issue):
  139. self.branch = branch
  140. self.issue = issue
  141. def GetBranch(self):
  142. return self.branch
  143. def GetIssue(self):
  144. return self.issue
  145. class SystemExitMock(Exception):
  146. pass
  147. class TestGitClBasic(unittest.TestCase):
  148. def setUp(self):
  149. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  150. mock.patch('sys.stdout', StringIO()).start()
  151. mock.patch('sys.stderr', StringIO()).start()
  152. self.addCleanup(mock.patch.stopall)
  153. def test_die_with_error(self):
  154. with self.assertRaises(SystemExitMock):
  155. git_cl.DieWithError('foo', git_cl.ChangeDescription('lorem ipsum'))
  156. self.assertEqual(sys.stderr.getvalue(), 'foo\n')
  157. self.assertTrue('saving CL description' in sys.stdout.getvalue())
  158. self.assertTrue('Content of CL description' in sys.stdout.getvalue())
  159. self.assertTrue('lorem ipsum' in sys.stdout.getvalue())
  160. sys.exit.assert_called_once_with(1)
  161. def test_die_with_error_no_desc(self):
  162. with self.assertRaises(SystemExitMock):
  163. git_cl.DieWithError('foo')
  164. self.assertEqual(sys.stderr.getvalue(), 'foo\n')
  165. self.assertEqual(sys.stdout.getvalue(), '')
  166. sys.exit.assert_called_once_with(1)
  167. def test_fetch_description(self):
  168. cl = git_cl.Changelist(issue=1, codereview_host='host')
  169. cl.description = 'x'
  170. self.assertEqual(cl.FetchDescription(), 'x')
  171. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  172. @mock.patch('git_cl.Changelist.GetStatus', lambda cl: cl.status)
  173. def test_get_cl_statuses(self, *_mocks):
  174. statuses = [
  175. 'closed', 'commit', 'dry-run', 'lgtm', 'reply', 'unsent', 'waiting']
  176. changes = []
  177. for status in statuses:
  178. cl = git_cl.Changelist()
  179. cl.status = status
  180. changes.append(cl)
  181. actual = set(git_cl.get_cl_statuses(changes, True))
  182. self.assertEqual(set(zip(changes, statuses)), actual)
  183. def test_upload_to_non_default_branch_no_retry(self):
  184. m = mock.patch('git_cl.Changelist._CMDUploadChange',
  185. side_effect=[git_cl.GitPushError(), None]).start()
  186. mock.patch('git_cl.Changelist.GetRemoteBranch',
  187. return_value=('foo', 'bar')).start()
  188. mock.patch('git_cl.Changelist.GetGerritProject',
  189. return_value='foo').start()
  190. mock.patch('git_cl.gerrit_util.GetProjectHead',
  191. return_value='refs/heads/main').start()
  192. cl = git_cl.Changelist()
  193. options = optparse.Values()
  194. options.target_branch = 'refs/heads/bar'
  195. with self.assertRaises(SystemExitMock):
  196. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  197. # ensure upload is called once
  198. self.assertEqual(len(m.mock_calls), 1)
  199. sys.exit.assert_called_once_with(1)
  200. # option not set as retry didn't happen
  201. self.assertFalse(hasattr(options, 'force'))
  202. self.assertFalse(hasattr(options, 'edit_description'))
  203. def test_upload_to_old_default_still_active(self):
  204. m = mock.patch('git_cl.Changelist._CMDUploadChange',
  205. side_effect=[git_cl.GitPushError(), None]).start()
  206. mock.patch('git_cl.Changelist.GetRemoteBranch',
  207. return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
  208. mock.patch('git_cl.Changelist.GetGerritProject',
  209. return_value='foo').start()
  210. mock.patch('git_cl.gerrit_util.GetProjectHead',
  211. return_value='refs/heads/main').start()
  212. cl = git_cl.Changelist()
  213. options = optparse.Values()
  214. options.target_branch = 'refs/heads/main'
  215. with self.assertRaises(SystemExitMock):
  216. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  217. # ensure upload is called once
  218. self.assertEqual(len(m.mock_calls), 1)
  219. sys.exit.assert_called_once_with(1)
  220. # option not set as retry didn't happen
  221. self.assertFalse(hasattr(options, 'force'))
  222. self.assertFalse(hasattr(options, 'edit_description'))
  223. def test_upload_with_message_file_no_editor(self):
  224. m = mock.patch('git_cl.ChangeDescription.prompt',
  225. return_value=None).start()
  226. mock.patch('git_cl.Changelist.GetRemoteBranch',
  227. return_value=('foo', git_cl.DEFAULT_NEW_BRANCH)).start()
  228. mock.patch('git_cl.GetTargetRef',
  229. return_value='refs/heads/main').start()
  230. mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck', lambda
  231. offer_removal: None).start()
  232. mock.patch('git_cl.Changelist.GetIssue', return_value=None).start()
  233. mock.patch('git_cl.Changelist.GetBranch',
  234. side_effect=SystemExitMock).start()
  235. mock.patch('git_cl.GenerateGerritChangeId', return_value=None).start()
  236. mock.patch('git_cl.RunGit').start()
  237. cl = git_cl.Changelist()
  238. options = optparse.Values()
  239. options.target_branch = 'refs/heads/main'
  240. options.squash = True
  241. options.edit_description = False
  242. options.force = False
  243. options.preserve_tryjobs = False
  244. options.message_file = "message.txt"
  245. with self.assertRaises(SystemExitMock):
  246. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  247. self.assertEqual(len(m.mock_calls), 0)
  248. options.message_file = None
  249. with self.assertRaises(SystemExitMock):
  250. cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
  251. self.assertEqual(len(m.mock_calls), 1)
  252. def test_get_cl_statuses_no_changes(self):
  253. self.assertEqual([], list(git_cl.get_cl_statuses([], True)))
  254. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  255. @mock.patch('multiprocessing.pool.ThreadPool')
  256. def test_get_cl_statuses_timeout(self, *_mocks):
  257. changes = [git_cl.Changelist() for _ in range(2)]
  258. pool = multiprocessing.pool.ThreadPool()
  259. it = pool.imap_unordered.return_value.__iter__ = mock.Mock()
  260. it.return_value.next.side_effect = [
  261. (changes[0], 'lgtm'),
  262. multiprocessing.TimeoutError,
  263. ]
  264. actual = list(git_cl.get_cl_statuses(changes, True))
  265. self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual)
  266. @mock.patch('git_cl.Changelist.GetIssueURL')
  267. def test_get_cl_statuses_not_finegrained(self, _mock):
  268. changes = [git_cl.Changelist() for _ in range(2)]
  269. urls = ['some-url', None]
  270. git_cl.Changelist.GetIssueURL.side_effect = urls
  271. actual = set(git_cl.get_cl_statuses(changes, False))
  272. self.assertEqual(
  273. set([(changes[0], 'waiting'), (changes[1], 'error')]), actual)
  274. def test_get_issue_url(self):
  275. cl = git_cl.Changelist(issue=123)
  276. cl._gerrit_server = 'https://example.com'
  277. self.assertEqual(cl.GetIssueURL(), 'https://example.com/123')
  278. self.assertEqual(cl.GetIssueURL(short=True), 'https://example.com/123')
  279. cl = git_cl.Changelist(issue=123)
  280. cl._gerrit_server = 'https://chromium-review.googlesource.com'
  281. self.assertEqual(cl.GetIssueURL(),
  282. 'https://chromium-review.googlesource.com/123')
  283. self.assertEqual(cl.GetIssueURL(short=True), 'https://crrev.com/c/123')
  284. def test_set_preserve_tryjobs(self):
  285. d = git_cl.ChangeDescription('Simple.')
  286. d.set_preserve_tryjobs()
  287. self.assertEqual(d.description.splitlines(), [
  288. 'Simple.',
  289. '',
  290. 'Cq-Do-Not-Cancel-Tryjobs: true',
  291. ])
  292. before = d.description
  293. d.set_preserve_tryjobs()
  294. self.assertEqual(before, d.description)
  295. d = git_cl.ChangeDescription('\n'.join([
  296. 'One is enough',
  297. '',
  298. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  299. 'Change-Id: Ideadbeef',
  300. ]))
  301. d.set_preserve_tryjobs()
  302. self.assertEqual(d.description.splitlines(), [
  303. 'One is enough',
  304. '',
  305. 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
  306. 'Change-Id: Ideadbeef',
  307. 'Cq-Do-Not-Cancel-Tryjobs: true',
  308. ])
  309. def test_get_bug_line_values(self):
  310. f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
  311. self.assertEqual(f('', ''), [])
  312. self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
  313. # Prefix that ends with colon.
  314. self.assertEqual(f('v8:', '456'), ['v8:456'])
  315. self.assertEqual(f('v8:', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  316. # Prefix that ends without colon.
  317. self.assertEqual(f('v8', '456'), ['v8:456'])
  318. self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
  319. # Not nice, but not worth carying.
  320. self.assertEqual(f('v8:', 'chromium:123,456,v8:123'),
  321. ['v8:456', 'chromium:123', 'v8:123'])
  322. self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
  323. ['v8:456', 'chromium:123', 'v8:123'])
  324. @mock.patch('gerrit_util.GetAccountDetails')
  325. def test_valid_accounts(self, mockGetAccountDetails):
  326. mock_per_account = {
  327. 'u1': None, # 404, doesn't exist.
  328. 'u2': {
  329. '_account_id': 123124,
  330. 'avatars': [],
  331. 'email': 'u2@example.com',
  332. 'name': 'User Number 2',
  333. 'status': 'OOO',
  334. },
  335. 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
  336. }
  337. def GetAccountDetailsMock(_, account):
  338. # Poor-man's mock library's side_effect.
  339. v = mock_per_account.pop(account)
  340. if isinstance(v, Exception):
  341. raise v
  342. return v
  343. mockGetAccountDetails.side_effect = GetAccountDetailsMock
  344. actual = git_cl.gerrit_util.ValidAccounts(
  345. 'host', ['u1', 'u2', 'u3'], max_threads=1)
  346. self.assertEqual(actual, {
  347. 'u2': {
  348. '_account_id': 123124,
  349. 'avatars': [],
  350. 'email': 'u2@example.com',
  351. 'name': 'User Number 2',
  352. 'status': 'OOO',
  353. },
  354. })
  355. class TestParseIssueURL(unittest.TestCase):
  356. def _test(self, arg, issue=None, patchset=None, hostname=None, fail=False):
  357. parsed = git_cl.ParseIssueNumberArgument(arg)
  358. self.assertIsNotNone(parsed)
  359. if fail:
  360. self.assertFalse(parsed.valid)
  361. return
  362. self.assertTrue(parsed.valid)
  363. self.assertEqual(parsed.issue, issue)
  364. self.assertEqual(parsed.patchset, patchset)
  365. self.assertEqual(parsed.hostname, hostname)
  366. def test_basic(self):
  367. self._test('123', 123)
  368. self._test('', fail=True)
  369. self._test('abc', fail=True)
  370. self._test('123/1', fail=True)
  371. self._test('123a', fail=True)
  372. self._test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
  373. self._test('ssh://chrome-review.source.com/c/123/1/', fail=True)
  374. def test_gerrit_url(self):
  375. self._test('https://codereview.source.com/123', 123, None,
  376. 'codereview.source.com')
  377. self._test('http://chrome-review.source.com/c/123', 123, None,
  378. 'chrome-review.source.com')
  379. self._test('https://chrome-review.source.com/c/123/', 123, None,
  380. 'chrome-review.source.com')
  381. self._test('https://chrome-review.source.com/c/123/4', 123, 4,
  382. 'chrome-review.source.com')
  383. self._test('https://chrome-review.source.com/#/c/123/4', 123, 4,
  384. 'chrome-review.source.com')
  385. self._test('https://chrome-review.source.com/c/123/4', 123, 4,
  386. 'chrome-review.source.com')
  387. self._test('https://chrome-review.source.com/123', 123, None,
  388. 'chrome-review.source.com')
  389. self._test('https://chrome-review.source.com/123/4', 123, 4,
  390. 'chrome-review.source.com')
  391. self._test('https://chrome-review.source.com/bad/123/4', fail=True)
  392. self._test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
  393. self._test('https://chrome-review.source.com/c/abc/', fail=True)
  394. def test_short_urls(self):
  395. self._test('https://crrev.com/c/2151934', 2151934, None,
  396. 'chromium-review.googlesource.com')
  397. def test_missing_scheme(self):
  398. self._test('codereview.source.com/123', 123, None, 'codereview.source.com')
  399. self._test('crrev.com/c/2151934', 2151934, None,
  400. 'chromium-review.googlesource.com')
  401. class GitCookiesCheckerTest(unittest.TestCase):
  402. def setUp(self):
  403. super(GitCookiesCheckerTest, self).setUp()
  404. self.c = git_cl._GitCookiesChecker()
  405. self.c._all_hosts = []
  406. mock.patch('sys.stdout', StringIO()).start()
  407. self.addCleanup(mock.patch.stopall)
  408. def mock_hosts_creds(self, subhost_identity_pairs):
  409. def ensure_googlesource(h):
  410. if not h.endswith(git_cl._GOOGLESOURCE):
  411. assert not h.endswith('.')
  412. return h + '.' + git_cl._GOOGLESOURCE
  413. return h
  414. self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
  415. for h, i in subhost_identity_pairs]
  416. def test_identity_parsing(self):
  417. self.assertEqual(self.c._parse_identity('ldap.google.com'),
  418. ('ldap', 'google.com'))
  419. self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
  420. ('ldap', 'example.com'))
  421. # Specical case because we know there are no subdomains in chromium.org.
  422. self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
  423. ('note.period', 'chromium.org'))
  424. # Pathological: ".period." can be either username OR domain, more likely
  425. # domain.
  426. self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
  427. ('note', 'period.example.com'))
  428. def test_analysis_nothing(self):
  429. self.c._all_hosts = []
  430. self.assertFalse(self.c.has_generic_host())
  431. self.assertEqual(set(), self.c.get_conflicting_hosts())
  432. self.assertEqual(set(), self.c.get_duplicated_hosts())
  433. self.assertEqual(set(), self.c.get_partially_configured_hosts())
  434. def test_analysis(self):
  435. self.mock_hosts_creds([
  436. ('.googlesource.com', 'git-example.chromium.org'),
  437. ('chromium', 'git-example.google.com'),
  438. ('chromium-review', 'git-example.google.com'),
  439. ('chrome-internal', 'git-example.chromium.org'),
  440. ('chrome-internal-review', 'git-example.chromium.org'),
  441. ('conflict', 'git-example.google.com'),
  442. ('conflict-review', 'git-example.chromium.org'),
  443. ('dup', 'git-example.google.com'),
  444. ('dup', 'git-example.google.com'),
  445. ('dup-review', 'git-example.google.com'),
  446. ('partial', 'git-example.google.com'),
  447. ('gpartial-review', 'git-example.google.com'),
  448. ])
  449. self.assertTrue(self.c.has_generic_host())
  450. self.assertEqual(set(['conflict.googlesource.com']),
  451. self.c.get_conflicting_hosts())
  452. self.assertEqual(set(['dup.googlesource.com']),
  453. self.c.get_duplicated_hosts())
  454. self.assertEqual(set(['partial.googlesource.com',
  455. 'gpartial-review.googlesource.com']),
  456. self.c.get_partially_configured_hosts())
  457. def test_report_no_problems(self):
  458. self.test_analysis_nothing()
  459. self.assertFalse(self.c.find_and_report_problems())
  460. self.assertEqual(sys.stdout.getvalue(), '')
  461. @mock.patch(
  462. 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
  463. return_value=os.path.join('~', '.gitcookies'))
  464. def test_report(self, *_mocks):
  465. self.test_analysis()
  466. self.assertTrue(self.c.find_and_report_problems())
  467. with open(os.path.join(os.path.dirname(__file__),
  468. 'git_cl_creds_check_report.txt')) as f:
  469. expected = f.read() % {
  470. 'sep': os.sep,
  471. }
  472. def by_line(text):
  473. return [l.rstrip() for l in text.rstrip().splitlines()]
  474. self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
  475. self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
  476. class TestGitCl(unittest.TestCase):
  477. def setUp(self):
  478. super(TestGitCl, self).setUp()
  479. self.calls = []
  480. self._calls_done = []
  481. self.failed = False
  482. mock.patch('sys.stdout', StringIO()).start()
  483. mock.patch(
  484. 'git_cl.time_time',
  485. lambda: self._mocked_call('time.time')).start()
  486. mock.patch(
  487. 'git_cl.metrics.collector.add_repeated',
  488. lambda *a: self._mocked_call('add_repeated', *a)).start()
  489. mock.patch('subprocess2.call', self._mocked_call).start()
  490. mock.patch('subprocess2.check_call', self._mocked_call).start()
  491. mock.patch('subprocess2.check_output', self._mocked_call).start()
  492. mock.patch(
  493. 'subprocess2.communicate',
  494. lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
  495. mock.patch(
  496. 'git_cl.gclient_utils.CheckCallAndFilter',
  497. self._mocked_call).start()
  498. mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
  499. mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
  500. mock.patch(
  501. 'git_cl.SaveDescriptionBackup',
  502. lambda _: self._mocked_call('SaveDescriptionBackup')).start()
  503. mock.patch(
  504. 'git_cl.write_json',
  505. lambda *a: self._mocked_call('write_json', *a)).start()
  506. mock.patch(
  507. 'git_cl.Changelist.RunHook',
  508. return_value={'more_cc': ['test-more-cc@chromium.org']}).start()
  509. mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
  510. mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
  511. mock.patch('gerrit_util.GetChangeDetail').start()
  512. mock.patch(
  513. 'git_cl.gerrit_util.GetChangeComments',
  514. lambda *a: self._mocked_call('GetChangeComments', *a)).start()
  515. mock.patch(
  516. 'git_cl.gerrit_util.GetChangeRobotComments',
  517. lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
  518. mock.patch(
  519. 'git_cl.gerrit_util.AddReviewers',
  520. lambda *a: self._mocked_call('AddReviewers', *a)).start()
  521. mock.patch(
  522. 'git_cl.gerrit_util.SetReview',
  523. lambda h, i, msg=None, labels=None, notify=None, ready=None: (
  524. self._mocked_call(
  525. 'SetReview', h, i, msg, labels, notify, ready))).start()
  526. mock.patch(
  527. 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
  528. return_value=False).start()
  529. mock.patch(
  530. 'git_cl.gerrit_util.GceAuthenticator.is_gce',
  531. return_value=False).start()
  532. mock.patch(
  533. 'git_cl.gerrit_util.ValidAccounts',
  534. lambda *a: self._mocked_call('ValidAccounts', *a)).start()
  535. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  536. mock.patch('git_cl.Settings.GetRoot', return_value='').start()
  537. self.mockGit = GitMocks()
  538. mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
  539. mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
  540. mock.patch('scm.GIT.ResolveCommit', return_value='hash').start()
  541. mock.patch('scm.GIT.IsValidRevision', return_value=True).start()
  542. mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
  543. mock.patch(
  544. 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
  545. mock.patch(
  546. 'scm.GIT.FetchUpstreamTuple',
  547. return_value=('origin', 'refs/heads/main')).start()
  548. mock.patch(
  549. 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
  550. # It's important to reset settings to not have inter-tests interference.
  551. git_cl.settings = None
  552. self.addCleanup(mock.patch.stopall)
  553. def tearDown(self):
  554. try:
  555. if not self.failed:
  556. self.assertEqual([], self.calls)
  557. except AssertionError:
  558. calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
  559. if len(self.calls) > 5:
  560. calls += ' ...\n'
  561. self.fail(
  562. '\n'
  563. 'There are un-consumed calls after this test has finished:\n' +
  564. calls)
  565. finally:
  566. super(TestGitCl, self).tearDown()
  567. def _mocked_call(self, *args, **_kwargs):
  568. self.assertTrue(
  569. self.calls,
  570. '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
  571. top = self.calls.pop(0)
  572. expected_args, result = top
  573. # Also logs otherwise it could get caught in a try/finally and be hard to
  574. # diagnose.
  575. if expected_args != args:
  576. N = 5
  577. prior_calls = '\n '.join(
  578. '@%d: %r' % (len(self._calls_done) - N + i, c[0])
  579. for i, c in enumerate(self._calls_done[-N:]))
  580. following_calls = '\n '.join(
  581. '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
  582. for i, c in enumerate(self.calls[:N]))
  583. extended_msg = (
  584. 'A few prior calls:\n %s\n\n'
  585. 'This (expected):\n @%d: %r\n'
  586. 'This (actual):\n @%d: %r\n\n'
  587. 'A few following expected calls:\n %s' %
  588. (prior_calls, len(self._calls_done), expected_args,
  589. len(self._calls_done), args, following_calls))
  590. self.failed = True
  591. self.fail('@%d\n'
  592. ' Expected: %r\n'
  593. ' Actual: %r\n'
  594. '\n'
  595. '%s' % (
  596. len(self._calls_done), expected_args, args, extended_msg))
  597. self._calls_done.append(top)
  598. if isinstance(result, Exception):
  599. raise result
  600. # stdout from git commands is supposed to be a bytestream. Convert it here
  601. # instead of converting all test output in this file to bytes.
  602. if args[0][0] == 'git' and not isinstance(result, bytes):
  603. result = result.encode('utf-8')
  604. return result
  605. @mock.patch('sys.stdin', StringIO('blah\nye\n'))
  606. @mock.patch('sys.stdout', StringIO())
  607. def test_ask_for_explicit_yes_true(self):
  608. self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
  609. self.assertEqual(
  610. 'prompt [Yes/No]: Please, type yes or no: ',
  611. sys.stdout.getvalue())
  612. def test_LoadCodereviewSettingsFromFile_gerrit(self):
  613. codereview_file = StringIO('GERRIT_HOST: true')
  614. self.calls = [
  615. ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
  616. ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
  617. ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
  618. ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
  619. ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
  620. ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
  621. CERR1),
  622. ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
  623. CERR1),
  624. ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
  625. CERR1),
  626. ((['git', 'config', 'gerrit.host', 'true'],), ''),
  627. ]
  628. self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
  629. @classmethod
  630. def _gerrit_base_calls(cls, issue=None, fetched_description=None,
  631. fetched_status=None, other_cl_owner=None,
  632. custom_cl_base=None, short_hostname='chromium',
  633. change_id=None, default_branch='main',
  634. reset_issue=False):
  635. calls = [
  636. (
  637. (['os.path.isfile', '.gitmodules'], ),
  638. 'True',
  639. ),
  640. ]
  641. if custom_cl_base:
  642. ancestor_revision = custom_cl_base
  643. else:
  644. # Determine ancestor_revision to be merge base.
  645. ancestor_revision = 'origin/' + default_branch
  646. if issue:
  647. # TODO: if tests don't provide a `change_id` the default used here
  648. # will cause the TRACES_README_FORMAT mock (which uses the test provided
  649. # `change_id` to fail.
  650. gerrit_util.GetChangeDetail.return_value = {
  651. 'owner': {'email': (other_cl_owner or 'owner@example.com')},
  652. 'change_id': (change_id or '123456789'),
  653. 'current_revision': 'sha1_of_current_revision',
  654. 'revisions': {'sha1_of_current_revision': {
  655. 'commit': {'message': fetched_description},
  656. }},
  657. 'status': fetched_status or 'NEW',
  658. }
  659. if fetched_status == 'ABANDONED':
  660. return calls
  661. if fetched_status == 'MERGED':
  662. calls.append(
  663. (('ask_for_data',
  664. 'Change https://chromium-review.googlesource.com/%s has been '
  665. 'submitted, new uploads are not allowed. Would you like to start '
  666. 'a new change (Y/n)?' % issue), 'y' if reset_issue else 'n')
  667. )
  668. if not reset_issue:
  669. return calls
  670. # Part of SetIssue call.
  671. calls.append(
  672. ((['git', 'log', '-1', '--format=%B'],), ''))
  673. if other_cl_owner:
  674. calls += [
  675. (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
  676. ]
  677. calls += [
  678. ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
  679. ([custom_cl_base] if custom_cl_base else
  680. [ancestor_revision, 'HEAD']),),
  681. '+dat'),
  682. ]
  683. return calls
  684. def _gerrit_upload_calls(self,
  685. description,
  686. reviewers,
  687. squash,
  688. squash_mode='default',
  689. title=None,
  690. notify=False,
  691. post_amend_description=None,
  692. issue=None,
  693. cc=None,
  694. custom_cl_base=None,
  695. short_hostname='chromium',
  696. labels=None,
  697. change_id=None,
  698. final_description=None,
  699. gitcookies_exists=True,
  700. force=False,
  701. edit_description=None,
  702. default_branch='main',
  703. ref_to_push='abcdef0123456789',
  704. external_parent=None,
  705. push_opts=None):
  706. if post_amend_description is None:
  707. post_amend_description = description
  708. cc = cc or []
  709. calls = []
  710. if squash_mode in ('override_squash', 'override_nosquash'):
  711. self.mockGit.config['gerrit.override-squash-uploads'] = (
  712. 'true' if squash_mode == 'override_squash' else 'false')
  713. if not git_footers.get_footer_change_id(description) and not squash:
  714. calls += [
  715. (('DownloadGerritHook', False), ''),
  716. ]
  717. if squash:
  718. if not issue and not force:
  719. calls += [
  720. ((['RunEditor'],), description),
  721. ]
  722. # user wants to edit description
  723. if edit_description:
  724. calls += [
  725. ((['RunEditor'],), edit_description),
  726. ]
  727. if external_parent:
  728. parent = external_parent
  729. else:
  730. if custom_cl_base is None:
  731. parent = 'origin/' + default_branch
  732. git_common.get_or_create_merge_base.return_value = parent
  733. else:
  734. calls += [
  735. (([
  736. 'git', 'merge-base', '--is-ancestor', custom_cl_base,
  737. 'refs/remotes/origin/' + default_branch
  738. ], ), callError(1)), # Means not ancenstor.
  739. (('ask_for_data',
  740. 'Do you take responsibility for cleaning up potential mess '
  741. 'resulting from proceeding with upload? Press Enter to upload, '
  742. 'or Ctrl+C to abort'), ''),
  743. ]
  744. parent = custom_cl_base
  745. calls += [
  746. ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
  747. '0123456789abcdef'),
  748. ((['FileWrite', '/tmp/fake-temp1', description],), None),
  749. ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
  750. '-F', '/tmp/fake-temp1'],),
  751. ref_to_push),
  752. ]
  753. else:
  754. ref_to_push = 'HEAD'
  755. parent = 'origin/refs/heads/' + default_branch
  756. calls += [
  757. (('SaveDescriptionBackup',), None),
  758. ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
  759. ]
  760. metrics_arguments = []
  761. if notify:
  762. ref_suffix = '%ready,notify=ALL'
  763. metrics_arguments += ['ready', 'notify=ALL']
  764. else:
  765. if not issue and squash:
  766. ref_suffix = '%wip'
  767. metrics_arguments.append('wip')
  768. else:
  769. ref_suffix = '%notify=NONE'
  770. metrics_arguments.append('notify=NONE')
  771. # If issue is given, then description is fetched from Gerrit instead.
  772. if not title:
  773. if issue is None:
  774. if squash:
  775. title = 'Initial upload'
  776. else:
  777. calls += [
  778. ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
  779. (('ask_for_data', 'Title for patchset []: '), 'User input'),
  780. ]
  781. title = 'User input'
  782. if title:
  783. ref_suffix += ',m=' + gerrit_util.PercentEncodeForGitRef(title)
  784. metrics_arguments.append('m')
  785. for k, v in sorted((labels or {}).items()):
  786. ref_suffix += ',l=%s+%d' % (k, v)
  787. metrics_arguments.append('l=%s+%d' % (k, v))
  788. if short_hostname == 'chromium':
  789. # All reviewers and ccs get into ref_suffix.
  790. for r in sorted(reviewers):
  791. ref_suffix += ',r=%s' % r
  792. metrics_arguments.append('r')
  793. if issue is None:
  794. cc += ['test-more-cc@chromium.org', 'joe@example.com']
  795. for c in sorted(cc):
  796. ref_suffix += ',cc=%s' % c
  797. metrics_arguments.append('cc')
  798. reviewers, cc = [], []
  799. else:
  800. # TODO(crbug/877717): remove this case.
  801. calls += [
  802. (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
  803. sorted(reviewers) + ['joe@example.com',
  804. 'test-more-cc@chromium.org'] + cc),
  805. {
  806. e: {'email': e}
  807. for e in (reviewers + ['joe@example.com'] + cc)
  808. })
  809. ]
  810. for r in sorted(reviewers):
  811. if r != 'bad-account-or-email':
  812. ref_suffix += ',r=%s' % r
  813. metrics_arguments.append('r')
  814. reviewers.remove(r)
  815. if issue is None:
  816. cc += ['joe@example.com']
  817. for c in sorted(cc):
  818. ref_suffix += ',cc=%s' % c
  819. metrics_arguments.append('cc')
  820. if c in cc:
  821. cc.remove(c)
  822. calls += [
  823. (
  824. ('time.time', ),
  825. 1000,
  826. ),
  827. (
  828. ([
  829. 'git', 'push',
  830. 'https://%s.googlesource.com/my/repo' % short_hostname,
  831. ref_to_push + ':refs/for/refs/heads/' + default_branch +
  832. ref_suffix
  833. ] + (push_opts if push_opts else []), ),
  834. (('remote:\n'
  835. 'remote: Processing changes: (\)\n'
  836. 'remote: Processing changes: (|)\n'
  837. 'remote: Processing changes: (/)\n'
  838. 'remote: Processing changes: (-)\n'
  839. 'remote: Processing changes: new: 1 (/)\n'
  840. 'remote: Processing changes: new: 1, done\n'
  841. 'remote:\n'
  842. 'remote: New Changes:\n'
  843. 'remote: '
  844. 'https://%s-review.googlesource.com/#/c/my/repo/+/123456'
  845. ' XXX\n'
  846. 'remote:\n'
  847. 'To https://%s.googlesource.com/my/repo\n'
  848. ' * [new branch] hhhh -> refs/for/refs/heads/%s\n') %
  849. (short_hostname, short_hostname, default_branch)),
  850. ),
  851. (
  852. ('time.time', ),
  853. 2000,
  854. ),
  855. (
  856. ('add_repeated', 'sub_commands', {
  857. 'execution_time': 1000,
  858. 'command': 'git push',
  859. 'exit_code': 0,
  860. 'arguments': sorted(metrics_arguments),
  861. }),
  862. None,
  863. ),
  864. ]
  865. final_description = final_description or post_amend_description.strip()
  866. trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
  867. # Trace-related calls
  868. calls += [
  869. # Write a description with context for the current trace.
  870. (
  871. ([
  872. 'FileWrite', trace_name + '-README',
  873. '%(date)s\n'
  874. '%(short_hostname)s-review.googlesource.com\n'
  875. '%(change_id)s\n'
  876. '%(title)s\n'
  877. '%(description)s\n'
  878. '1000\n'
  879. '0\n'
  880. '%(trace_name)s' % {
  881. 'date': '2017-03-16T20:00:41.000000',
  882. 'short_hostname': short_hostname,
  883. 'change_id': change_id,
  884. 'description': final_description,
  885. 'title': title or '<untitled>',
  886. 'trace_name': trace_name,
  887. }
  888. ], ),
  889. None,
  890. ),
  891. # Read traces and shorten git hashes.
  892. (
  893. (['os.path.isfile',
  894. os.path.join('TEMP_DIR', 'trace-packet')], ),
  895. True,
  896. ),
  897. (
  898. (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
  899. ('git-hash: 0123456789012345678901234567890123456789\n'
  900. 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
  901. ),
  902. (
  903. ([
  904. 'FileWrite',
  905. os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
  906. 'git-hash: abcdea\n'
  907. ], ),
  908. None,
  909. ),
  910. # Make zip file for the git traces.
  911. (
  912. (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
  913. None,
  914. ),
  915. # Collect git config and gitcookies.
  916. (
  917. (['git', 'config', '-l'], ),
  918. 'git-config-output',
  919. ),
  920. (
  921. ([
  922. 'FileWrite',
  923. os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
  924. ], ),
  925. None,
  926. ),
  927. (
  928. (['os.path.isfile',
  929. os.path.join('~', '.gitcookies')], ),
  930. gitcookies_exists,
  931. ),
  932. ]
  933. if gitcookies_exists:
  934. calls += [
  935. (
  936. (['FileRead', os.path.join('~', '.gitcookies')], ),
  937. 'gitcookies 1/SECRET',
  938. ),
  939. (
  940. ([
  941. 'FileWrite',
  942. os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
  943. ], ),
  944. None,
  945. ),
  946. ]
  947. calls += [
  948. # Make zip file for the git config and gitcookies.
  949. (
  950. (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
  951. None,
  952. ),
  953. ]
  954. # TODO(crbug/877717): this should never be used.
  955. if squash and short_hostname != 'chromium':
  956. calls += [
  957. (('AddReviewers',
  958. 'chromium-review.googlesource.com', 'my%2Frepo~123456',
  959. sorted(reviewers),
  960. cc + ['test-more-cc@chromium.org'],
  961. notify),
  962. ''),
  963. ]
  964. return calls
  965. def _run_gerrit_upload_test(self,
  966. upload_args,
  967. description,
  968. reviewers=None,
  969. squash=True,
  970. squash_mode=None,
  971. title=None,
  972. notify=False,
  973. post_amend_description=None,
  974. issue=None,
  975. patchset=None,
  976. cc=None,
  977. fetched_status=None,
  978. other_cl_owner=None,
  979. custom_cl_base=None,
  980. short_hostname='chromium',
  981. labels=None,
  982. change_id=None,
  983. final_description=None,
  984. gitcookies_exists=True,
  985. force=False,
  986. log_description=None,
  987. edit_description=None,
  988. fetched_description=None,
  989. default_branch='main',
  990. ref_to_push='abcdef0123456789',
  991. external_parent=None,
  992. push_opts=None,
  993. reset_issue=False):
  994. """Generic gerrit upload test framework."""
  995. if squash_mode is None:
  996. if '--no-squash' in upload_args:
  997. squash_mode = 'nosquash'
  998. elif '--squash' in upload_args:
  999. squash_mode = 'squash'
  1000. else:
  1001. squash_mode = 'default'
  1002. reviewers = reviewers or []
  1003. cc = cc or []
  1004. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  1005. CookiesAuthenticatorMockFactory(
  1006. same_auth=('git-owner.example.com', '', 'pass'))).start()
  1007. mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck', lambda
  1008. offer_removal: None).start()
  1009. mock.patch('git_cl.Changelist.GetMostRecentPatchset', lambda _, update:
  1010. patchset).start()
  1011. mock.patch('git_cl.gclient_utils.RunEditor',
  1012. lambda *_, **__: self._mocked_call(['RunEditor'])).start()
  1013. mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
  1014. 'DownloadGerritHook', force)).start()
  1015. mock.patch('git_cl.gclient_utils.FileRead',
  1016. lambda path: self._mocked_call(['FileRead', path])).start()
  1017. mock.patch('git_cl.gclient_utils.FileWrite',
  1018. lambda path, contents: self._mocked_call(
  1019. ['FileWrite', path, contents])).start()
  1020. mock.patch('git_cl.datetime_now',
  1021. lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
  1022. mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
  1023. mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
  1024. mock.patch('git_cl.TRACES_README_FORMAT',
  1025. '%(now)s\n'
  1026. '%(gerrit_host)s\n'
  1027. '%(change_id)s\n'
  1028. '%(title)s\n'
  1029. '%(description)s\n'
  1030. '%(execution_time)s\n'
  1031. '%(exit_code)s\n'
  1032. '%(trace_name)s').start()
  1033. mock.patch('git_cl.shutil.make_archive',
  1034. lambda *args: self._mocked_call(['make_archive'] +
  1035. list(args))).start()
  1036. mock.patch('os.path.isfile',
  1037. lambda path: self._mocked_call(['os.path.isfile', path])).start()
  1038. mock.patch(
  1039. 'git_cl._create_description_from_log',
  1040. return_value=log_description or description).start()
  1041. mock.patch(
  1042. 'git_cl.Changelist._AddChangeIdToCommitMessage',
  1043. return_value=post_amend_description or description).start()
  1044. mock.patch(
  1045. 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
  1046. mock.patch(
  1047. 'git_common.get_or_create_merge_base',
  1048. return_value='origin/' + default_branch).start()
  1049. mock.patch(
  1050. 'gclient_utils.AskForData',
  1051. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  1052. self.mockGit.config['gerrit.host'] = 'true'
  1053. self.mockGit.config['branch.main.gerritissue'] = (
  1054. str(issue) if issue else None)
  1055. self.mockGit.config['remote.origin.url'] = (
  1056. 'https://%s.googlesource.com/my/repo' % short_hostname)
  1057. self.mockGit.config['user.email'] = 'me@example.com'
  1058. self.calls = self._gerrit_base_calls(
  1059. issue=issue,
  1060. fetched_description=fetched_description or description,
  1061. fetched_status=fetched_status,
  1062. other_cl_owner=other_cl_owner,
  1063. custom_cl_base=custom_cl_base,
  1064. short_hostname=short_hostname,
  1065. change_id=change_id,
  1066. default_branch=default_branch,
  1067. reset_issue=reset_issue)
  1068. if fetched_status == 'ABANDONED' or (
  1069. fetched_status == 'MERGED' and not reset_issue):
  1070. pass # readability
  1071. else:
  1072. if fetched_status == 'MERGED' and reset_issue:
  1073. fetched_status = 'NEW'
  1074. issue = None
  1075. mock.patch(
  1076. 'gclient_utils.temporary_file', TemporaryFileMock()).start()
  1077. mock.patch('os.remove', return_value=True).start()
  1078. self.calls += self._gerrit_upload_calls(
  1079. description,
  1080. reviewers,
  1081. squash,
  1082. squash_mode=squash_mode,
  1083. title=title,
  1084. notify=notify,
  1085. post_amend_description=post_amend_description,
  1086. issue=issue,
  1087. cc=cc,
  1088. custom_cl_base=custom_cl_base,
  1089. short_hostname=short_hostname,
  1090. labels=labels,
  1091. change_id=change_id,
  1092. final_description=final_description,
  1093. gitcookies_exists=gitcookies_exists,
  1094. force=force,
  1095. edit_description=edit_description,
  1096. default_branch=default_branch,
  1097. ref_to_push=ref_to_push,
  1098. external_parent=external_parent,
  1099. push_opts=push_opts)
  1100. # Uncomment when debugging.
  1101. # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
  1102. git_cl.main(['upload'] + upload_args)
  1103. if squash:
  1104. self.assertIssueAndPatchset(patchset=str((patchset or 0) + 1))
  1105. self.assertEqual(
  1106. ref_to_push,
  1107. scm.GIT.GetBranchConfig('', 'main',
  1108. git_cl.GERRIT_SQUASH_HASH_CONFIG_KEY))
  1109. def test_gerrit_upload_traces_no_gitcookies(self):
  1110. self._run_gerrit_upload_test(
  1111. ['--no-squash'],
  1112. 'desc ✔\n\nBUG=\n',
  1113. [],
  1114. squash=False,
  1115. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1116. change_id='Ixxx',
  1117. gitcookies_exists=False)
  1118. def test_gerrit_upload_without_change_id(self):
  1119. self._run_gerrit_upload_test(
  1120. [],
  1121. 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1122. [],
  1123. change_id='Ixxx')
  1124. def test_gerrit_upload_without_change_id_nosquash(self):
  1125. self._run_gerrit_upload_test(
  1126. ['--no-squash'],
  1127. 'desc ✔\n\nBUG=\n',
  1128. [],
  1129. squash=False,
  1130. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1131. change_id='Ixxx')
  1132. def test_gerrit_upload_without_change_id_override_nosquash(self):
  1133. self._run_gerrit_upload_test(
  1134. [],
  1135. 'desc ✔\n\nBUG=\n',
  1136. [],
  1137. squash=False,
  1138. squash_mode='override_nosquash',
  1139. post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
  1140. change_id='Ixxx')
  1141. def test_gerrit_no_reviewer(self):
  1142. self._run_gerrit_upload_test(
  1143. [],
  1144. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1145. [],
  1146. squash=False,
  1147. squash_mode='override_nosquash',
  1148. change_id='I123456789')
  1149. def test_gerrit_push_opts(self):
  1150. self._run_gerrit_upload_test(['-o', 'wip'],
  1151. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1152. [],
  1153. squash=False,
  1154. squash_mode='override_nosquash',
  1155. change_id='I123456789',
  1156. push_opts=['-o', 'wip'])
  1157. def test_gerrit_no_reviewer_non_chromium_host(self):
  1158. # TODO(crbug/877717): remove this test case.
  1159. self._run_gerrit_upload_test([],
  1160. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  1161. [],
  1162. squash=False,
  1163. squash_mode='override_nosquash',
  1164. short_hostname='other',
  1165. change_id='I123456789')
  1166. def test_gerrit_patchset_title_special_chars_nosquash(self):
  1167. self._run_gerrit_upload_test(
  1168. ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
  1169. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1170. squash=False,
  1171. squash_mode='override_nosquash',
  1172. change_id='I123456789',
  1173. title='We\'ll escape ^_ ^ special chars...@{u}')
  1174. def test_gerrit_reviewers_cmd_line(self):
  1175. self._run_gerrit_upload_test(
  1176. ['-r', 'foo@example.com', '--send-mail'],
  1177. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1178. reviewers=['foo@example.com'],
  1179. squash=False,
  1180. squash_mode='override_nosquash',
  1181. notify=True,
  1182. change_id='I123456789',
  1183. final_description=(
  1184. 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
  1185. def test_gerrit_reviewers_cmd_line_send_email(self):
  1186. self._run_gerrit_upload_test(
  1187. ['-r', 'foo@example.com', '--send-email'],
  1188. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1189. reviewers=['foo@example.com'],
  1190. squash=False,
  1191. squash_mode='override_nosquash',
  1192. notify=True,
  1193. change_id='I123456789',
  1194. final_description=(
  1195. 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
  1196. def test_gerrit_upload_force_sets_bug(self):
  1197. self._run_gerrit_upload_test(
  1198. ['-b', '10000', '-f'],
  1199. u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
  1200. [],
  1201. force=True,
  1202. fetched_description='desc=\n\nChange-Id: Ixxx',
  1203. change_id='Ixxx')
  1204. def test_gerrit_upload_corrects_wrong_change_id(self):
  1205. self._run_gerrit_upload_test(
  1206. ['-b', '10000', '-m', 'Title', '--edit-description'],
  1207. u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
  1208. [],
  1209. issue='123456',
  1210. edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
  1211. fetched_description='desc=\n\nChange-Id: Ixxxx',
  1212. title='Title',
  1213. change_id='Ixxxx')
  1214. def test_gerrit_upload_force_sets_fixed(self):
  1215. self._run_gerrit_upload_test(
  1216. ['-x', '10000', '-f'],
  1217. u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
  1218. [],
  1219. force=True,
  1220. fetched_description='desc=\n\nChange-Id: Ixxx',
  1221. change_id='Ixxx')
  1222. def test_gerrit_reviewer_multiple(self):
  1223. self._run_gerrit_upload_test([], 'desc ✔\nBUG=\nR=another@example.com\n'
  1224. 'CC=more@example.com,people@example.com\n\n'
  1225. 'Change-Id: 123456789',
  1226. ['another@example.com'],
  1227. cc=['more@example.com', 'people@example.com'],
  1228. change_id='123456789')
  1229. def test_gerrit_upload_squash_first_is_default(self):
  1230. self._run_gerrit_upload_test(
  1231. [],
  1232. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1233. [],
  1234. change_id='123456789')
  1235. def test_gerrit_upload_squash_first(self):
  1236. self._run_gerrit_upload_test(
  1237. ['--squash'],
  1238. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1239. [],
  1240. squash=True,
  1241. change_id='123456789')
  1242. def test_gerrit_upload_squash_first_title(self):
  1243. self._run_gerrit_upload_test(
  1244. ['-f', '-t', 'title'],
  1245. 'title\n\ndesc\n\nChange-Id: 123456789',
  1246. [],
  1247. title='title',
  1248. force=True,
  1249. squash=True,
  1250. log_description='desc',
  1251. change_id='123456789')
  1252. def test_gerrit_upload_squash_first_with_labels(self):
  1253. self._run_gerrit_upload_test(
  1254. ['--squash', '--cq-dry-run', '--enable-auto-submit'],
  1255. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1256. [],
  1257. squash=True,
  1258. labels={'Commit-Queue': 1, 'Auto-Submit': 1},
  1259. change_id='123456789')
  1260. def test_gerrit_upload_squash_first_against_rev(self):
  1261. custom_cl_base = 'custom_cl_base_rev_or_branch'
  1262. self._run_gerrit_upload_test(
  1263. ['--squash', custom_cl_base],
  1264. 'desc ✔\nBUG=\n\nChange-Id: 123456789',
  1265. [],
  1266. squash=True,
  1267. custom_cl_base=custom_cl_base,
  1268. change_id='123456789')
  1269. self.assertIn(
  1270. 'If you proceed with upload, more than 1 CL may be created by Gerrit',
  1271. sys.stdout.getvalue())
  1272. def test_gerrit_upload_squash_reupload(self):
  1273. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1274. self._run_gerrit_upload_test(
  1275. ['--squash'],
  1276. description,
  1277. [],
  1278. squash=True,
  1279. issue=123456,
  1280. change_id='123456789')
  1281. @mock.patch('sys.stderr', StringIO())
  1282. def test_gerrit_upload_squash_reupload_to_abandoned(self):
  1283. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1284. with self.assertRaises(SystemExitMock):
  1285. self._run_gerrit_upload_test(
  1286. ['--squash'],
  1287. description,
  1288. [],
  1289. squash=True,
  1290. issue=123456,
  1291. fetched_status='ABANDONED',
  1292. change_id='123456789')
  1293. self.assertEqual(
  1294. 'Change https://chromium-review.googlesource.com/123456 has been '
  1295. 'abandoned, new uploads are not allowed\n',
  1296. sys.stderr.getvalue())
  1297. @mock.patch(
  1298. 'gerrit_util.GetAccountDetails',
  1299. return_value={'email': 'yet-another@example.com'})
  1300. def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
  1301. description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
  1302. self._run_gerrit_upload_test(
  1303. ['--squash'],
  1304. description,
  1305. [],
  1306. squash=True,
  1307. issue=123456,
  1308. other_cl_owner='other@example.com',
  1309. change_id='123456789')
  1310. self.assertIn(
  1311. 'WARNING: Change 123456 is owned by other@example.com, but you '
  1312. 'authenticate to Gerrit as yet-another@example.com.\n'
  1313. 'Uploading may fail due to lack of permissions',
  1314. sys.stdout.getvalue())
  1315. @mock.patch('sys.stderr', StringIO())
  1316. def test_gerrit_upload_for_merged(self):
  1317. with self.assertRaises(SystemExitMock):
  1318. self._run_gerrit_upload_test(
  1319. [],
  1320. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1321. [],
  1322. issue=123456,
  1323. fetched_status='MERGED',
  1324. change_id='I123456789',
  1325. reset_issue=False)
  1326. self.assertEqual(
  1327. 'New uploads are not allowed.\n',
  1328. sys.stderr.getvalue())
  1329. def test_gerrit_upload_new_issue_for_merged(self):
  1330. self._run_gerrit_upload_test(
  1331. [],
  1332. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
  1333. [],
  1334. issue=123456,
  1335. fetched_status='MERGED',
  1336. change_id='I123456789',
  1337. reset_issue=True)
  1338. def test_upload_change_description_editor(self):
  1339. fetched_description = 'foo\n\nChange-Id: 123456789'
  1340. description = 'bar\n\nChange-Id: 123456789'
  1341. self._run_gerrit_upload_test(
  1342. ['--squash', '--edit-description'],
  1343. description,
  1344. [],
  1345. fetched_description=fetched_description,
  1346. squash=True,
  1347. issue=123456,
  1348. change_id='123456789',
  1349. edit_description=description)
  1350. @mock.patch('git_cl.Changelist._UpdateWithExternalChanges',
  1351. return_value='newparent')
  1352. def test_upload_change_uses_external_base(self, *_mocks):
  1353. squash_hash = 'branch.main.' + git_cl.GERRIT_SQUASH_HASH_CONFIG_KEY
  1354. self.mockGit.config[squash_hash] = 'beef2'
  1355. self._run_gerrit_upload_test(
  1356. ['--squash'],
  1357. 'desc ✔\n\nBUG=\n\nChange-Id: 123456789',
  1358. [],
  1359. squash=True,
  1360. issue=123456,
  1361. change_id='123456789',
  1362. ref_to_push='beef2',
  1363. external_parent='newparent',
  1364. )
  1365. @mock.patch('git_cl.Changelist.GetGerritHost',
  1366. return_value='chromium-review.googlesource.com')
  1367. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1368. return_value=('origin', 'refs/remotes/origin/main'))
  1369. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1370. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1371. @mock.patch('git_cl._UploadAllPrecheck')
  1372. @mock.patch('git_cl.Changelist.PrepareCherryPickSquashedCommit')
  1373. def test_upload_all_squashed_cherry_pick(self, mockCherryPickCommit,
  1374. mockUploadAllPrecheck,
  1375. mockRunGitPush,
  1376. mockPostUploadUpdates, *_mocks):
  1377. # Set up
  1378. cls = [
  1379. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345'),
  1380. git_cl.Changelist(branchref='refs/heads/upstream-branch')
  1381. ]
  1382. mockUploadAllPrecheck.return_value = (cls, True)
  1383. upstream_gerrit_commit = 'upstream-commit'
  1384. self.mockGit.config[
  1385. 'branch.upstream-branch.gerritsquashhash'] = upstream_gerrit_commit
  1386. reviewers = []
  1387. ccs = []
  1388. commit_to_push = 'commit-to-push'
  1389. new_last_upload = 'new-last-upload'
  1390. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1391. prev_patchset = 2
  1392. new_upload = git_cl._NewUpload(reviewers, ccs, commit_to_push,
  1393. new_last_upload, upstream_gerrit_commit,
  1394. change_desc, prev_patchset)
  1395. mockCherryPickCommit.return_value = new_upload
  1396. options = optparse.Values()
  1397. options.send_mail = options.private = False
  1398. options.squash = True
  1399. options.title = None
  1400. options.message = 'honk stonk'
  1401. options.topic = 'circus'
  1402. options.enable_auto_submit = False
  1403. options.set_bot_commit = False
  1404. options.cq_dry_run = False
  1405. options.use_commit_queue = False
  1406. options.hashtags = ['cow']
  1407. options.target_branch = None
  1408. options.push_options = ['uploadvalidator~skip']
  1409. orig_args = []
  1410. mockRunGitPush.return_value = (
  1411. 'remote: https://chromium-review.'
  1412. 'googlesource.com/c/chromium/circus/clown/+/1234 stonks')
  1413. # Call
  1414. git_cl.UploadAllSquashed(options, orig_args)
  1415. # Asserts
  1416. mockCherryPickCommit.assert_called_once_with(options,
  1417. upstream_gerrit_commit)
  1418. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1419. 'm=honk_stonk,topic=circus,hashtag=cow')
  1420. expected_refspec_opts = [
  1421. 'notify=NONE', 'm=honk_stonk', 'topic=circus', 'hashtag=cow'
  1422. ]
  1423. mockRunGitPush.assert_called_once_with(expected_refspec,
  1424. expected_refspec_opts, mock.ANY,
  1425. options.push_options)
  1426. mockPostUploadUpdates.assert_called_once_with(options, new_upload, '1234')
  1427. @mock.patch('git_cl.Changelist.GetGerritHost',
  1428. return_value='chromium-review.googlesource.com')
  1429. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1430. return_value=('origin', 'refs/remotes/origin/main'))
  1431. @mock.patch(
  1432. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  1433. side_effect=['current-upstream-ancestor', 'next-upstream-ancestor'])
  1434. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1435. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1436. @mock.patch('git_cl._UploadAllPrecheck')
  1437. @mock.patch('git_cl.Changelist.PrepareSquashedCommit')
  1438. def test_upload_all_squashed(self, mockSquashedCommit, mockUploadAllPrecheck,
  1439. mockRunGitPush, mockPostUploadUpdates, *_mocks):
  1440. # Set up
  1441. cls = [
  1442. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345'),
  1443. git_cl.Changelist(branchref='refs/heads/upstream-branch')
  1444. ]
  1445. mockUploadAllPrecheck.return_value = (cls, False)
  1446. reviewers = []
  1447. ccs = []
  1448. current_commit_to_push = 'commit-to-push'
  1449. current_new_last_upload = 'new-last-upload'
  1450. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1451. prev_patchset = 2
  1452. new_upload_current = git_cl._NewUpload(reviewers, ccs,
  1453. current_commit_to_push,
  1454. current_new_last_upload,
  1455. 'next-upstream-ancestor',
  1456. change_desc, prev_patchset)
  1457. upstream_desc = git_cl.ChangeDescription('kwak')
  1458. upstream_parent = 'origin-commit'
  1459. upstream_new_last_upload = 'upstrea-last-upload'
  1460. upstream_commit_to_push = 'upstream_push_commit'
  1461. new_upload_upstream = git_cl._NewUpload(reviewers, ccs,
  1462. upstream_commit_to_push,
  1463. upstream_new_last_upload,
  1464. upstream_parent, upstream_desc,
  1465. prev_patchset)
  1466. mockSquashedCommit.side_effect = [new_upload_upstream, new_upload_current]
  1467. options = optparse.Values()
  1468. options.send_mail = options.private = False
  1469. options.squash = True
  1470. options.title = None
  1471. options.message = 'honk stonk'
  1472. options.topic = 'circus'
  1473. options.enable_auto_submit = False
  1474. options.set_bot_commit = False
  1475. options.cq_dry_run = False
  1476. options.use_commit_queue = False
  1477. options.hashtags = ['cow']
  1478. options.target_branch = None
  1479. options.push_options = ['uploadvalidator~skip']
  1480. orig_args = []
  1481. mockRunGitPush.return_value = (
  1482. 'remote: https://chromium-review.'
  1483. 'googlesource.com/c/chromium/circus/clown/+/1233 kwak'
  1484. '\n'
  1485. 'remote: https://chromium-review.'
  1486. 'googlesource.com/c/chromium/circus/clown/+/1234 stonks')
  1487. # Call
  1488. git_cl.UploadAllSquashed(options, orig_args)
  1489. # Asserts
  1490. self.maxDiff = None
  1491. self.assertEqual(mockSquashedCommit.mock_calls, [
  1492. mock.call(options,
  1493. 'current-upstream-ancestor',
  1494. 'current-upstream-ancestor',
  1495. end_commit='next-upstream-ancestor'),
  1496. mock.call(options,
  1497. upstream_commit_to_push,
  1498. 'next-upstream-ancestor',
  1499. end_commit=None)
  1500. ])
  1501. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1502. 'topic=circus,hashtag=cow')
  1503. expected_refspec_opts = ['notify=NONE', 'topic=circus', 'hashtag=cow']
  1504. mockRunGitPush.assert_called_once_with(expected_refspec,
  1505. expected_refspec_opts, mock.ANY,
  1506. options.push_options)
  1507. self.assertEqual(mockPostUploadUpdates.mock_calls, [
  1508. mock.call(options, new_upload_upstream, '1233'),
  1509. mock.call(options, new_upload_current, '1234')
  1510. ])
  1511. @mock.patch('git_cl.Changelist.GetGerritHost',
  1512. return_value='chromium-review.googlesource.com')
  1513. @mock.patch('git_cl.Changelist.GetRemoteBranch',
  1514. return_value=('origin', 'refs/remotes/origin/main'))
  1515. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream',
  1516. return_value='current-upstream-ancestor')
  1517. @mock.patch('git_cl.Changelist._UpdateWithExternalChanges')
  1518. @mock.patch('git_cl.Changelist.PostUploadUpdates')
  1519. @mock.patch('git_cl.Changelist._RunGitPushWithTraces')
  1520. @mock.patch('git_cl._UploadAllPrecheck')
  1521. @mock.patch('git_cl.Changelist.PrepareSquashedCommit')
  1522. def test_upload_all_squashed_external_changes(self, mockSquashedCommit,
  1523. mockUploadAllPrecheck,
  1524. mockRunGitPush,
  1525. mockPostUploadUpdates,
  1526. mockExternalChanges, *_mocks):
  1527. options = optparse.Values()
  1528. options.send_mail = options.private = False
  1529. options.squash = True
  1530. options.title = None
  1531. options.topic = 'circus'
  1532. options.message = 'honk stonk'
  1533. options.enable_auto_submit = False
  1534. options.set_bot_commit = False
  1535. options.cq_dry_run = False
  1536. options.use_commit_queue = False
  1537. options.hashtags = ['cow']
  1538. options.target_branch = None
  1539. options.push_options = ['uploadvalidator~skip']
  1540. orig_args = []
  1541. cls = [
  1542. git_cl.Changelist(branchref='refs/heads/current-branch', issue='12345')
  1543. ]
  1544. mockUploadAllPrecheck.return_value = (cls, False)
  1545. reviewers = []
  1546. ccs = []
  1547. # Test case: user wants to pull in external changes.
  1548. mockExternalChanges.reset_mock()
  1549. mockExternalChanges.return_value = None
  1550. current_commit_to_push = 'commit-to-push'
  1551. current_new_last_upload = 'new-last-upload'
  1552. change_desc = git_cl.ChangeDescription('stonks/nChange-Id:ec15e81197380')
  1553. prev_patchset = 2
  1554. new_upload_current = git_cl._NewUpload(reviewers, ccs,
  1555. current_commit_to_push,
  1556. current_new_last_upload,
  1557. 'next-upstream-ancestor',
  1558. change_desc, prev_patchset)
  1559. mockSquashedCommit.return_value = new_upload_current
  1560. mockRunGitPush.return_value = (
  1561. 'remote: https://chromium-review.'
  1562. 'googlesource.com/c/chromium/circus/clown/+/1233 kwak')
  1563. # Test case: user wants to pull in external changes.
  1564. mockExternalChanges.reset_mock()
  1565. mockExternalChanges.return_value = 'external-commit'
  1566. # Call
  1567. git_cl.UploadAllSquashed(options, orig_args)
  1568. # Asserts
  1569. self.assertEqual(mockSquashedCommit.mock_calls, [
  1570. mock.call(
  1571. options, 'external-commit', 'external-commit', end_commit=None)
  1572. ])
  1573. expected_refspec = ('commit-to-push:refs/for/refs/heads/main%notify=NONE,'
  1574. 'm=honk_stonk,topic=circus,hashtag=cow')
  1575. expected_refspec_opts = [
  1576. 'notify=NONE', 'm=honk_stonk', 'topic=circus', 'hashtag=cow'
  1577. ]
  1578. mockRunGitPush.assert_called_once_with(expected_refspec,
  1579. expected_refspec_opts, mock.ANY,
  1580. options.push_options)
  1581. self.assertEqual(mockPostUploadUpdates.mock_calls,
  1582. [mock.call(options, new_upload_current, '1233')])
  1583. # Test case: user does not want external changes or there are none.
  1584. mockSquashedCommit.reset_mock()
  1585. mockExternalChanges.return_value = None
  1586. # Call
  1587. git_cl.UploadAllSquashed(options, orig_args)
  1588. # Asserts
  1589. self.assertEqual(mockSquashedCommit.mock_calls, [
  1590. mock.call(options,
  1591. 'current-upstream-ancestor',
  1592. 'current-upstream-ancestor',
  1593. end_commit=None)
  1594. ])
  1595. @mock.patch(
  1596. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1597. @mock.patch('git_cl.RunGit')
  1598. @mock.patch('git_cl.RunGitSilent')
  1599. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1600. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1601. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1602. @mock.patch('scm.GIT.GetBranchRef')
  1603. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1604. @mock.patch('scm.GIT.IsAncestor')
  1605. @mock.patch('gclient_utils.AskForData')
  1606. def test_upload_all_precheck_long_chain(
  1607. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1608. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1609. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1610. mockRunGit, *_mocks):
  1611. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1612. branches = [
  1613. 'current', 'upstream3', 'blank3', 'blank2', 'upstream2', 'blank1',
  1614. 'upstream1', 'origin/main'
  1615. ]
  1616. mockGetBranchRef.side_effect = (
  1617. ['refs/heads/current'] + # detached HEAD check
  1618. ['refs/heads/%s' % b for b in branches])
  1619. mockGetCommonAncestorWithUpstream.side_effect = [
  1620. 'commit3.5',
  1621. 'commit3.5',
  1622. 'commit3.5',
  1623. 'commit2.5',
  1624. 'commit1.5',
  1625. 'commit1.5',
  1626. 'commit0.5',
  1627. ]
  1628. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1629. ('.', 'refs/heads/blank3'),
  1630. ('.', 'refs/heads/blank2'),
  1631. ('.', 'refs/heads/upstream2'),
  1632. ('.', 'refs/heads/blank1'),
  1633. ('.', 'refs/heads/upstream1'),
  1634. ('origin', 'refs/heads/origin/main')]
  1635. # end commits
  1636. mockRunGit.side_effect = [
  1637. 'commit4', 'commit3.5', 'commit3.5', 'commit2', 'commit1.5', 'commit1',
  1638. 'commit0.5'
  1639. ]
  1640. mockRunGitSilent.side_effect = [
  1641. 'diff', 'diff', None, None, 'diff', None, 'diff'
  1642. ]
  1643. # Get gerrit squash hash. We only check this for branches that have a diff.
  1644. # Set to None to trigger `must_upload_upstream`.
  1645. mockGitGetBranchConfigValue.return_value = None
  1646. options = optparse.Values()
  1647. options.force = False
  1648. options.cherry_pick_stacked = False
  1649. orig_args = ['--preserve-tryjobs', '--chicken']
  1650. # Case 2: upstream3 has never been uploaded.
  1651. # (so no LAST_UPLOAD_HASH_CONIFG_KEY)
  1652. # Case 4: upstream2's last_upload is behind upstream3's base_commit
  1653. self.mockGit.config['branch.upstream2.%s' %
  1654. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit2.3'
  1655. mockIsAncestor.side_effect = [True]
  1656. # Case 3: upstream1's last_upload matches upstream2's base_commit
  1657. self.mockGit.config['branch.upstream1.%s' %
  1658. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit1.5'
  1659. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1660. self.assertFalse(cherry_pick)
  1661. mockAskForData.assert_called_once_with(
  1662. "\noptions ['--preserve-tryjobs', '--chicken'] will be used for all "
  1663. "uploads.\nAt least one parent branch in `current, upstream3, "
  1664. "upstream2` has never been uploaded and must be uploaded before/with "
  1665. "`upstream3`.\nPress Enter to confirm, or Ctrl+C to abort")
  1666. self.assertEqual(len(cls), 3)
  1667. @mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
  1668. lambda offer_removal: None)
  1669. @mock.patch('git_cl.RunGit')
  1670. @mock.patch('git_cl.RunGitSilent')
  1671. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1672. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1673. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1674. @mock.patch('scm.GIT.GetBranchRef')
  1675. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1676. @mock.patch('scm.GIT.IsAncestor')
  1677. @mock.patch('gclient_utils.AskForData')
  1678. def test_upload_all_precheck_options_must_upload(
  1679. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1680. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1681. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1682. mockRunGit, *_mocks):
  1683. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1684. branches = ['current', 'upstream3', 'main']
  1685. mockGetBranchRef.side_effect = (
  1686. ['refs/heads/current'] + # detached HEAD check
  1687. ['refs/heads/%s' % b for b in branches])
  1688. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1689. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1690. ('origin', 'refs/heads/main')]
  1691. mockIsAncestor.return_value = True
  1692. # end commits
  1693. mockRunGit.return_value = 'any-commit'
  1694. mockRunGitSilent.return_value = 'diff'
  1695. # Get gerrit squash hash. We only check this for branches that have a diff.
  1696. mockGitGetBranchConfigValue.return_value = None
  1697. # Test case: User wants to cherry pick, but all branches must be uploaded.
  1698. options = optparse.Values()
  1699. options.force = True
  1700. options.cherry_pick_stacked = True
  1701. orig_args = []
  1702. with self.assertRaises(SystemExitMock):
  1703. git_cl._UploadAllPrecheck(options, orig_args)
  1704. # Test case: User does not require cherry picking
  1705. options.cherry_pick_stacked = False
  1706. # reset side_effects
  1707. mockGetBranchRef.side_effect = (
  1708. ['refs/heads/current'] + # detached HEAD check
  1709. ['refs/heads/%s' % b for b in branches])
  1710. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1711. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1712. ('origin', 'refs/heads/main')]
  1713. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1714. self.assertFalse(cherry_pick)
  1715. self.assertEqual(len(cls), 2)
  1716. mockAskForData.assert_not_called()
  1717. # Test case: User does not require cherry picking and not in force mode.
  1718. options.force = False
  1719. # reset side_effects
  1720. mockGetBranchRef.side_effect = (
  1721. ['refs/heads/current'] + # detached HEAD check
  1722. ['refs/heads/%s' % b for b in branches])
  1723. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1724. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1725. ('origin', 'refs/heads/main')]
  1726. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1727. self.assertFalse(cherry_pick)
  1728. self.assertEqual(len(cls), 2)
  1729. mockAskForData.assert_called_once()
  1730. @mock.patch(
  1731. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1732. @mock.patch('git_cl.RunGit')
  1733. @mock.patch('git_cl.RunGitSilent')
  1734. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1735. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1736. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1737. @mock.patch('scm.GIT.GetBranchRef')
  1738. @mock.patch('scm.GIT.IsAncestor')
  1739. @mock.patch('gclient_utils.AskForData')
  1740. def test_upload_all_precheck_must_rebase(
  1741. self, mockAskForData, mockIsAncestor, mockGetBranchRef,
  1742. mockGetCommonAncestorWithUpstream, mockFetchUpstreamTuple,
  1743. mockGitGetBranchConfigValue, mockRunGitSilent, mockRunGit, *_mocks):
  1744. branches = ['current', 'upstream3']
  1745. mockGetBranchRef.side_effect = ['refs/heads/%s' % b for b in branches]
  1746. mockGetCommonAncestorWithUpstream.return_value = 'commit3.5'
  1747. mockFetchUpstreamTuple.return_value = ('.', 'refs/heads/upstream3')
  1748. # end commits
  1749. mockRunGit.return_value = 'commit4'
  1750. mockRunGitSilent.return_value = 'diff'
  1751. # Get gerrit squash hash. We only check this for branches that have a diff.
  1752. # Set to None to trigger `must_upload_upstream`.
  1753. mockGitGetBranchConfigValue.return_value = None
  1754. # Case 5: current's base_commit is behind upstream3's last_upload.
  1755. self.mockGit.config['branch.upstream3.%s' %
  1756. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit3.7'
  1757. mockIsAncestor.side_effect = [False, True]
  1758. with self.assertRaises(SystemExitMock):
  1759. options = optparse.Values()
  1760. options.force = False
  1761. options.cherry_pick_stacked = False
  1762. git_cl._UploadAllPrecheck(options, [])
  1763. @mock.patch(
  1764. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1765. @mock.patch('git_cl.RunGit')
  1766. @mock.patch('git_cl.RunGitSilent')
  1767. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1768. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1769. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1770. @mock.patch('scm.GIT.GetBranchRef')
  1771. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1772. @mock.patch('scm.GIT.IsAncestor')
  1773. @mock.patch('gclient_utils.AskForData')
  1774. def test_upload_all_precheck_hit_main(self, mockAskForData, mockIsAncestor,
  1775. mockGetRemoteBranch, mockGetBranchRef,
  1776. mockGetCommonAncestorWithUpstream,
  1777. mockFetchUpstreamTuple,
  1778. mockGitGetBranchConfigValue,
  1779. mockRunGitSilent, mockRunGit, *_mocks):
  1780. options = optparse.Values()
  1781. options.force = False
  1782. options.cherry_pick_stacked = False
  1783. orig_args = ['--preserve-tryjobs', '--chicken']
  1784. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1785. branches = ['current', 'upstream3', 'main']
  1786. mockGetBranchRef.side_effect = (
  1787. ['refs/heads/current'] + # detached HEAD check
  1788. ['refs/heads/%s' % b for b in branches])
  1789. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1790. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1791. ('origin', 'refs/heads/main')]
  1792. mockIsAncestor.return_value = True
  1793. # Give upstream3 a last upload hash
  1794. self.mockGit.config['branch.upstream3.%s' %
  1795. git_cl.LAST_UPLOAD_HASH_CONFIG_KEY] = 'commit3.4'
  1796. # end commits
  1797. mockRunGit.return_value = 'commit4'
  1798. mockRunGitSilent.return_value = 'diff'
  1799. # Get gerrit squash hash. We only check this for branches that have a diff.
  1800. mockGitGetBranchConfigValue.return_value = 'just needs to exist'
  1801. # Test case: user cherry picks with options
  1802. options.cherry_pick_stacked = True
  1803. # Reset side_effects
  1804. mockGetBranchRef.side_effect = (
  1805. ['refs/heads/current'] + # detached HEAD check
  1806. ['refs/heads/%s' % b for b in branches])
  1807. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1808. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1809. ('origin', 'refs/heads/main')]
  1810. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1811. self.assertTrue(cherry_pick)
  1812. self.assertEqual(len(cls), 2)
  1813. mockAskForData.assert_not_called()
  1814. # Test case: user uses force, no cherry-pick.
  1815. options.cherry_pick_stacked = False
  1816. options.force = True
  1817. # Reset side_effects
  1818. mockGetBranchRef.side_effect = (
  1819. ['refs/heads/current'] + # detached HEAD check
  1820. ['refs/heads/%s' % b for b in branches])
  1821. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1822. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1823. ('origin', 'refs/heads/main')]
  1824. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1825. self.assertFalse(cherry_pick)
  1826. self.assertEqual(len(cls), 2)
  1827. mockAskForData.assert_not_called()
  1828. # Test case: user wants to cherry pick after being asked.
  1829. mockAskForData.return_value = 'n'
  1830. options.cherry_pick_stacked = False
  1831. options.force = False
  1832. # Reset side_effects
  1833. mockGetBranchRef.side_effect = (
  1834. ['refs/heads/current'] + # detached HEAD check
  1835. ['refs/heads/%s' % b for b in branches])
  1836. mockGetCommonAncestorWithUpstream.side_effect = ['commit3.5', 'commit0.5']
  1837. mockFetchUpstreamTuple.side_effect = [('.', 'refs/heads/upstream3'),
  1838. ('origin', 'refs/heads/main')]
  1839. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1840. self.assertTrue(cherry_pick)
  1841. self.assertEqual(len(cls), 2)
  1842. mockAskForData.assert_called_once_with(
  1843. "\noptions ['--preserve-tryjobs', '--chicken'] will be used for all "
  1844. "uploads.\n"
  1845. "Press enter to update branches current, upstream3.\n"
  1846. "Or type `n` to upload only `current` cherry-picked on upstream3's "
  1847. "last upload:")
  1848. @mock.patch(
  1849. 'git_cl.Changelist._GerritCommitMsgHookCheck', lambda offer_removal: None)
  1850. @mock.patch('git_cl.RunGit')
  1851. @mock.patch('git_cl.RunGitSilent')
  1852. @mock.patch('git_cl.Changelist._GitGetBranchConfigValue')
  1853. @mock.patch('git_cl.Changelist.FetchUpstreamTuple')
  1854. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1855. @mock.patch('scm.GIT.GetBranchRef')
  1856. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1857. @mock.patch('scm.GIT.IsAncestor')
  1858. @mock.patch('gclient_utils.AskForData')
  1859. def test_upload_all_precheck_one_change(
  1860. self, mockAskForData, mockIsAncestor, mockGetRemoteBranch,
  1861. mockGetBranchRef, mockGetCommonAncestorWithUpstream,
  1862. mockFetchUpstreamTuple, mockGitGetBranchConfigValue, mockRunGitSilent,
  1863. mockRunGit, *_mocks):
  1864. options = optparse.Values()
  1865. options.force = False
  1866. options.cherry_pick_stacked = False
  1867. orig_args = ['--preserve-tryjobs', '--chicken']
  1868. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1869. mockGetBranchRef.side_effect = [
  1870. 'refs/heads/current', # detached HEAD check
  1871. 'refs/heads/current', # call within while loop
  1872. 'refs/heads/main',
  1873. 'refs/heads/main'
  1874. ]
  1875. mockGetCommonAncestorWithUpstream.return_value = 'commit3.5'
  1876. mockFetchUpstreamTuple.return_value = ('', 'refs/heads/main')
  1877. mockIsAncestor.return_value = True
  1878. # end commits
  1879. mockRunGit.return_value = 'commit4'
  1880. mockRunGitSilent.return_value = 'diff'
  1881. # Get gerrit squash hash. We only check this for branches that have a diff.
  1882. # Set to None to trigger `must_upload_upstream`.
  1883. mockGitGetBranchConfigValue.return_value = 'does not matter'
  1884. # Case 1: We hit the main branch
  1885. cls, cherry_pick = git_cl._UploadAllPrecheck(options, orig_args)
  1886. self.assertFalse(cherry_pick)
  1887. self.assertEqual(len(cls), 1)
  1888. mockAskForData.assert_not_called()
  1889. # No diff for current change
  1890. mockRunGitSilent.return_value = ''
  1891. with self.assertRaises(SystemExitMock):
  1892. git_cl._UploadAllPrecheck(options, orig_args)
  1893. @mock.patch('scm.GIT.GetBranchRef', return_value=None)
  1894. def test_upload_all_precheck_detached_HEAD(self, mockGetBranchRef):
  1895. with self.assertRaises(SystemExitMock):
  1896. git_cl._UploadAllPrecheck(optparse.Values(), [])
  1897. @mock.patch('git_cl.RunGit')
  1898. @mock.patch('git_cl.CMDupload')
  1899. @mock.patch('sys.stdin', StringIO('\n'))
  1900. @mock.patch('sys.stdout', StringIO())
  1901. def test_upload_branch_deps(self, *_mocks):
  1902. def mock_run_git(*args, **_kwargs):
  1903. if args[0] == ['for-each-ref',
  1904. '--format=%(refname:short) %(upstream:short)',
  1905. 'refs/heads']:
  1906. # Create a local branch dependency tree that looks like this:
  1907. # test1 -> test2 -> test3 -> test4 -> test5
  1908. # -> test3.1
  1909. # test6 -> test0
  1910. branch_deps = [
  1911. 'test2 test1', # test1 -> test2
  1912. 'test3 test2', # test2 -> test3
  1913. 'test3.1 test2', # test2 -> test3.1
  1914. 'test4 test3', # test3 -> test4
  1915. 'test5 test4', # test4 -> test5
  1916. 'test6 test0', # test0 -> test6
  1917. 'test7', # test7
  1918. ]
  1919. return '\n'.join(branch_deps)
  1920. git_cl.RunGit.side_effect = mock_run_git
  1921. git_cl.CMDupload.return_value = 0
  1922. class MockChangelist():
  1923. def __init__(self):
  1924. pass
  1925. def GetBranch(self):
  1926. return 'test1'
  1927. def GetIssue(self):
  1928. return '123'
  1929. def GetPatchset(self):
  1930. return '1001'
  1931. def IsGerrit(self):
  1932. return False
  1933. ret = git_cl.upload_branch_deps(MockChangelist(), [])
  1934. # CMDupload should have been called 5 times because of 5 dependent branches.
  1935. self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
  1936. self.assertEqual(0, ret)
  1937. def test_gerrit_change_id(self):
  1938. self.calls = [
  1939. ((['git', 'write-tree'], ),
  1940. 'hashtree'),
  1941. ((['git', 'rev-parse', 'HEAD~0'], ),
  1942. 'branch-parent'),
  1943. ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
  1944. 'A B <a@b.org> 1456848326 +0100'),
  1945. ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
  1946. 'C D <c@d.org> 1456858326 +0100'),
  1947. ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
  1948. 'hashchange'),
  1949. ]
  1950. change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
  1951. self.assertEqual(change_id, 'Ihashchange')
  1952. @mock.patch('gerrit_util.IsCodeOwnersEnabledOnHost')
  1953. @mock.patch('git_cl.Settings.GetBugPrefix')
  1954. @mock.patch('git_cl.Changelist.FetchDescription')
  1955. @mock.patch('git_cl.Changelist.GetBranch')
  1956. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  1957. @mock.patch('git_cl.Changelist.GetGerritHost')
  1958. @mock.patch('git_cl.Changelist.GetGerritProject')
  1959. @mock.patch('git_cl.Changelist.GetRemoteBranch')
  1960. @mock.patch('owners_client.OwnersClient.BatchListOwners')
  1961. def getDescriptionForUploadTest(self,
  1962. mockBatchListOwners=None,
  1963. mockGetRemoteBranch=None,
  1964. mockGetGerritProject=None,
  1965. mockGetGerritHost=None,
  1966. mockGetCommonAncestorWithUpstream=None,
  1967. mockGetBranch=None,
  1968. mockFetchDescription=None,
  1969. mockGetBugPrefix=None,
  1970. mockIsCodeOwnersEnabledOnHost=None,
  1971. initial_description='desc',
  1972. bug=None,
  1973. fixed=None,
  1974. branch='branch',
  1975. reviewers=None,
  1976. add_owners_to=None,
  1977. expected_description='desc'):
  1978. reviewers = reviewers or []
  1979. owners_by_path = {
  1980. 'a': ['a@example.com'],
  1981. 'b': ['b@example.com'],
  1982. 'c': ['c@example.com'],
  1983. }
  1984. mockIsCodeOwnersEnabledOnHost.return_value = True
  1985. mockGetBranch.return_value = branch
  1986. mockGetBugPrefix.return_value = 'prefix'
  1987. mockGetCommonAncestorWithUpstream.return_value = 'upstream'
  1988. mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
  1989. mockFetchDescription.return_value = 'desc'
  1990. mockBatchListOwners.side_effect = lambda ps: {
  1991. p: owners_by_path.get(p)
  1992. for p in ps
  1993. }
  1994. cl = git_cl.Changelist(issue=1234)
  1995. actual = cl._GetDescriptionForUpload(options=mock.Mock(
  1996. bug=bug,
  1997. fixed=fixed,
  1998. reviewers=reviewers,
  1999. add_owners_to=add_owners_to,
  2000. message=initial_description),
  2001. git_diff_args=None,
  2002. files=list(owners_by_path))
  2003. self.assertEqual(expected_description, actual.description)
  2004. def testGetDescriptionForUpload(self):
  2005. self.getDescriptionForUploadTest()
  2006. def testGetDescriptionForUpload_Bug(self):
  2007. self.getDescriptionForUploadTest(
  2008. bug='1234',
  2009. expected_description='\n'.join([
  2010. 'desc',
  2011. '',
  2012. 'Bug: prefix:1234',
  2013. ]))
  2014. def testGetDescriptionForUpload_Fixed(self):
  2015. self.getDescriptionForUploadTest(
  2016. fixed='1234',
  2017. expected_description='\n'.join([
  2018. 'desc',
  2019. '',
  2020. 'Fixed: prefix:1234',
  2021. ]))
  2022. @mock.patch('git_cl.Changelist.GetIssue')
  2023. def testGetDescriptionForUpload_BugFromBranch(self, mockGetIssue):
  2024. mockGetIssue.return_value = None
  2025. self.getDescriptionForUploadTest(
  2026. branch='bug-1234',
  2027. expected_description='\n'.join([
  2028. 'desc',
  2029. '',
  2030. 'Bug: prefix:1234',
  2031. ]))
  2032. @mock.patch('git_cl.Changelist.GetIssue')
  2033. def testGetDescriptionForUpload_FixedFromBranch(self, mockGetIssue):
  2034. mockGetIssue.return_value = None
  2035. self.getDescriptionForUploadTest(
  2036. branch='fix-1234',
  2037. expected_description='\n'.join([
  2038. 'desc',
  2039. '',
  2040. 'Fixed: prefix:1234',
  2041. ]))
  2042. def testGetDescriptionForUpload_SkipBugFromBranchIfAlreadyUploaded(self):
  2043. self.getDescriptionForUploadTest(
  2044. branch='bug-1234',
  2045. expected_description='desc',
  2046. )
  2047. def testGetDescriptionForUpload_AddOwnersToR(self):
  2048. self.getDescriptionForUploadTest(
  2049. reviewers=['a@example.com'],
  2050. add_owners_to='R',
  2051. expected_description='\n'.join([
  2052. 'desc',
  2053. '',
  2054. 'R=a@example.com, b@example.com, c@example.com',
  2055. ]))
  2056. def testGetDescriptionForUpload_AddOwnersToNoOwnersNeeded(self):
  2057. self.getDescriptionForUploadTest(
  2058. reviewers=['a@example.com', 'c@example.com'],
  2059. expected_description='\n'.join([
  2060. 'desc',
  2061. '',
  2062. 'R=a@example.com, c@example.com',
  2063. ]))
  2064. def testGetDescriptionForUpload_Reviewers(self):
  2065. self.getDescriptionForUploadTest(
  2066. reviewers=['a@example.com', 'b@example.com'],
  2067. expected_description='\n'.join([
  2068. 'desc',
  2069. '',
  2070. 'R=a@example.com, b@example.com',
  2071. ]))
  2072. def test_description_append_footer(self):
  2073. for init_desc, footer_line, expected_desc in [
  2074. # Use unique desc first lines for easy test failure identification.
  2075. ('foo', 'R=one', 'foo\n\nR=one'),
  2076. ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
  2077. ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  2078. ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
  2079. ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
  2080. 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
  2081. ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
  2082. 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
  2083. ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
  2084. ]:
  2085. desc = git_cl.ChangeDescription(init_desc)
  2086. desc.append_footer(footer_line)
  2087. self.assertEqual(desc.description, expected_desc)
  2088. def test_update_reviewers(self):
  2089. data = [
  2090. ('foo', [], 'foo'),
  2091. ('foo\nR=xx', [], 'foo\nR=xx'),
  2092. ('foo', ['a@c'], 'foo\n\nR=a@c'),
  2093. ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
  2094. ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
  2095. ('foo\nR=xx\nR=bar', ['a@c'], 'foo\n\nR=a@c, bar, xx'),
  2096. ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
  2097. ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  2098. ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
  2099. # Same as the line before, but full of whitespaces.
  2100. (
  2101. 'foo\nBar\n\n R = \n BUG = \n R = ',
  2102. ['c@c'],
  2103. 'foo\nBar\n\nR=c@c\n BUG =',
  2104. ),
  2105. # Whitespaces aren't interpreted as new lines.
  2106. ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
  2107. ]
  2108. expected = [i[-1] for i in data]
  2109. actual = []
  2110. for orig, reviewers, _expected in data:
  2111. obj = git_cl.ChangeDescription(orig)
  2112. obj.update_reviewers(reviewers)
  2113. actual.append(obj.description)
  2114. self.assertEqual(expected, actual)
  2115. def test_get_hash_tags(self):
  2116. cases = [
  2117. ('', []),
  2118. ('a', []),
  2119. ('[a]', ['a']),
  2120. ('[aa]', ['aa']),
  2121. ('[a ]', ['a']),
  2122. ('[a- ]', ['a']),
  2123. ('[a- b]', ['a-b']),
  2124. ('[a--b]', ['a-b']),
  2125. ('[a', []),
  2126. ('[a]x', ['a']),
  2127. ('[aa]x', ['aa']),
  2128. ('[a b]', ['a-b']),
  2129. ('[a b]', ['a-b']),
  2130. ('[a__b]', ['a-b']),
  2131. ('[a] x', ['a']),
  2132. ('[a][b]', ['a', 'b']),
  2133. ('[a] [b]', ['a', 'b']),
  2134. ('[a][b]x', ['a', 'b']),
  2135. ('[a][b] x', ['a', 'b']),
  2136. ('[a]\n[b]', ['a']),
  2137. ('[a\nb]', []),
  2138. ('[a][', ['a']),
  2139. ('Revert "[a] feature"', ['a']),
  2140. ('Reland "[a] feature"', ['a']),
  2141. ('Revert: [a] feature', ['a']),
  2142. ('Reland: [a] feature', ['a']),
  2143. ('Revert "Reland: [a] feature"', ['a']),
  2144. ('Foo: feature', ['foo']),
  2145. ('Foo Bar: feature', ['foo-bar']),
  2146. ('Change Foo::Bar', []),
  2147. ('Foo: Change Foo::Bar', ['foo']),
  2148. ('Revert "Foo bar: feature"', ['foo-bar']),
  2149. ('Reland "Foo bar: feature"', ['foo-bar']),
  2150. ]
  2151. for desc, expected in cases:
  2152. change_desc = git_cl.ChangeDescription(desc)
  2153. actual = change_desc.get_hash_tags()
  2154. self.assertEqual(
  2155. actual,
  2156. expected,
  2157. 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
  2158. self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'main'))
  2159. self.assertEqual(None, git_cl.GetTargetRef(None,
  2160. 'refs/remotes/origin/main',
  2161. 'main'))
  2162. # Check default target refs for branches.
  2163. self.assertEqual('refs/heads/main',
  2164. git_cl.GetTargetRef('origin', 'refs/remotes/origin/main',
  2165. None))
  2166. self.assertEqual('refs/heads/main',
  2167. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
  2168. None))
  2169. self.assertEqual('refs/heads/main',
  2170. git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
  2171. None))
  2172. self.assertEqual('refs/branch-heads/123',
  2173. git_cl.GetTargetRef('origin',
  2174. 'refs/remotes/branch-heads/123',
  2175. None))
  2176. self.assertEqual('refs/diff/test',
  2177. git_cl.GetTargetRef('origin',
  2178. 'refs/remotes/origin/refs/diff/test',
  2179. None))
  2180. self.assertEqual('refs/heads/chrome/m42',
  2181. git_cl.GetTargetRef('origin',
  2182. 'refs/remotes/origin/chrome/m42',
  2183. None))
  2184. # Check target refs for user-specified target branch.
  2185. for branch in ('branch-heads/123', 'remotes/branch-heads/123',
  2186. 'refs/remotes/branch-heads/123'):
  2187. self.assertEqual('refs/branch-heads/123',
  2188. git_cl.GetTargetRef('origin',
  2189. 'refs/remotes/origin/main',
  2190. branch))
  2191. for branch in ('origin/main', 'remotes/origin/main',
  2192. 'refs/remotes/origin/main'):
  2193. self.assertEqual('refs/heads/main',
  2194. git_cl.GetTargetRef('origin',
  2195. 'refs/remotes/branch-heads/123',
  2196. branch))
  2197. for branch in ('main', 'heads/main', 'refs/heads/main'):
  2198. self.assertEqual('refs/heads/main',
  2199. git_cl.GetTargetRef('origin',
  2200. 'refs/remotes/branch-heads/123',
  2201. branch))
  2202. @mock.patch('git_common.is_dirty_git_tree', return_value=True)
  2203. def test_patch_when_dirty(self, *_mocks):
  2204. # Patch when local tree is dirty.
  2205. self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
  2206. def assertIssueAndPatchset(
  2207. self, branch='main', issue='123456', patchset='7',
  2208. git_short_host='chromium'):
  2209. self.assertEqual(
  2210. issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
  2211. self.assertEqual(
  2212. patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
  2213. self.assertEqual(
  2214. 'https://%s-review.googlesource.com' % git_short_host,
  2215. scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
  2216. def _patch_common(self, git_short_host='chromium'):
  2217. mock.patch('scm.GIT.ResolveCommit', return_value='deadbeef').start()
  2218. self.mockGit.config['remote.origin.url'] = (
  2219. 'https://%s.googlesource.com/my/repo' % git_short_host)
  2220. gerrit_util.GetChangeDetail.return_value = {
  2221. 'current_revision': '7777777777',
  2222. 'revisions': {
  2223. '1111111111': {
  2224. '_number': 1,
  2225. 'fetch': {'http': {
  2226. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  2227. 'ref': 'refs/changes/56/123456/1',
  2228. }},
  2229. },
  2230. '7777777777': {
  2231. '_number': 7,
  2232. 'fetch': {'http': {
  2233. 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
  2234. 'ref': 'refs/changes/56/123456/7',
  2235. }},
  2236. },
  2237. },
  2238. }
  2239. def test_patch_gerrit_default(self):
  2240. self._patch_common()
  2241. self.calls += [
  2242. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2243. 'refs/changes/56/123456/7'],), ''),
  2244. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2245. ]
  2246. self.assertEqual(git_cl.main(['patch', '123456']), 0)
  2247. self.assertIssueAndPatchset()
  2248. def test_patch_gerrit_new_branch(self):
  2249. self._patch_common()
  2250. self.calls += [
  2251. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2252. 'refs/changes/56/123456/7'],), ''),
  2253. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2254. ]
  2255. self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
  2256. self.assertIssueAndPatchset(branch='feature')
  2257. def test_patch_gerrit_force(self):
  2258. self._patch_common('host')
  2259. self.calls += [
  2260. ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
  2261. 'refs/changes/56/123456/7'],), ''),
  2262. ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
  2263. ]
  2264. self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
  2265. self.assertIssueAndPatchset(git_short_host='host')
  2266. def test_patch_gerrit_guess_by_url(self):
  2267. self._patch_common('else')
  2268. self.calls += [
  2269. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  2270. 'refs/changes/56/123456/1'],), ''),
  2271. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2272. ]
  2273. self.assertEqual(git_cl.main(
  2274. ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
  2275. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  2276. def test_patch_gerrit_guess_by_url_with_repo(self):
  2277. self._patch_common('else')
  2278. self.calls += [
  2279. ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
  2280. 'refs/changes/56/123456/1'],), ''),
  2281. ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
  2282. ]
  2283. self.assertEqual(git_cl.main(
  2284. ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
  2285. 0)
  2286. self.assertIssueAndPatchset(patchset='1', git_short_host='else')
  2287. @mock.patch('sys.stderr', StringIO())
  2288. def test_patch_gerrit_conflict(self):
  2289. self._patch_common()
  2290. self.calls += [
  2291. ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
  2292. 'refs/changes/56/123456/7'],), ''),
  2293. ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
  2294. ]
  2295. with self.assertRaises(SystemExitMock):
  2296. git_cl.main(['patch', '123456'])
  2297. self.assertEqual(
  2298. 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
  2299. sys.stderr.getvalue())
  2300. @mock.patch(
  2301. 'gerrit_util.GetChangeDetail',
  2302. side_effect=gerrit_util.GerritError(404, ''))
  2303. @mock.patch('sys.stderr', StringIO())
  2304. def test_patch_gerrit_not_exists(self, *_mocks):
  2305. self.mockGit.config['remote.origin.url'] = (
  2306. 'https://chromium.googlesource.com/my/repo')
  2307. with self.assertRaises(SystemExitMock):
  2308. self.assertEqual(1, git_cl.main(['patch', '123456']))
  2309. self.assertEqual(
  2310. 'change 123456 at https://chromium-review.googlesource.com does not '
  2311. 'exist or you have no access to it\n',
  2312. sys.stderr.getvalue())
  2313. def _checkout_calls(self):
  2314. return [
  2315. ((['git', 'config', '--local', '--get-regexp',
  2316. 'branch\\..*\\.gerritissue'], ),
  2317. ('branch.ger-branch.gerritissue 123456\n'
  2318. 'branch.gbranch654.gerritissue 654321\n')),
  2319. ]
  2320. def test_checkout_gerrit(self):
  2321. """Tests git cl checkout <issue>."""
  2322. self.calls = self._checkout_calls()
  2323. self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
  2324. self.assertEqual(0, git_cl.main(['checkout', '123456']))
  2325. def test_checkout_not_found(self):
  2326. """Tests git cl checkout <issue>."""
  2327. self.calls = self._checkout_calls()
  2328. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  2329. def test_checkout_no_branch_issues(self):
  2330. """Tests git cl checkout <issue>."""
  2331. self.calls = [
  2332. ((['git', 'config', '--local', '--get-regexp',
  2333. 'branch\\..*\\.gerritissue'], ), CERR1),
  2334. ]
  2335. self.assertEqual(1, git_cl.main(['checkout', '99999']))
  2336. def _test_gerrit_ensure_authenticated_common(self, auth):
  2337. mock.patch(
  2338. 'gclient_utils.AskForData',
  2339. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2340. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2341. CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
  2342. self.mockGit.config['remote.origin.url'] = (
  2343. 'https://chromium.googlesource.com/my/repo')
  2344. cl = git_cl.Changelist()
  2345. cl.branch = 'main'
  2346. cl.branchref = 'refs/heads/main'
  2347. return cl
  2348. @mock.patch('sys.stderr', StringIO())
  2349. def test_gerrit_ensure_authenticated_missing(self):
  2350. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2351. 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
  2352. })
  2353. with self.assertRaises(SystemExitMock):
  2354. cl.EnsureAuthenticated(force=False)
  2355. self.assertEqual(
  2356. 'Credentials for the following hosts are required:\n'
  2357. ' chromium-review.googlesource.com\n'
  2358. 'These are read from ~%(sep)s.gitcookies '
  2359. '(or legacy ~%(sep)s%(netrc)s)\n'
  2360. 'You can (re)generate your credentials by visiting '
  2361. 'https://chromium.googlesource.com/new-password\n' % {
  2362. 'sep': os.sep,
  2363. 'netrc': NETRC_FILENAME,
  2364. }, sys.stderr.getvalue())
  2365. def test_gerrit_ensure_authenticated_conflict(self):
  2366. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2367. 'chromium.googlesource.com':
  2368. ('git-one.example.com', None, 'secret1'),
  2369. 'chromium-review.googlesource.com':
  2370. ('git-other.example.com', None, 'secret2'),
  2371. })
  2372. self.calls.append(
  2373. (('ask_for_data', 'If you know what you are doing '
  2374. 'press Enter to continue, or Ctrl+C to abort'), ''))
  2375. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2376. def test_gerrit_ensure_authenticated_ok(self):
  2377. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2378. 'chromium.googlesource.com':
  2379. ('git-same.example.com', None, 'secret'),
  2380. 'chromium-review.googlesource.com':
  2381. ('git-same.example.com', None, 'secret'),
  2382. })
  2383. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2384. def test_gerrit_ensure_authenticated_skipped(self):
  2385. self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
  2386. cl = self._test_gerrit_ensure_authenticated_common(auth={})
  2387. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2388. def test_gerrit_ensure_authenticated_bearer_token(self):
  2389. cl = self._test_gerrit_ensure_authenticated_common(auth={
  2390. 'chromium.googlesource.com':
  2391. ('', None, 'secret'),
  2392. 'chromium-review.googlesource.com':
  2393. ('', None, 'secret'),
  2394. })
  2395. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2396. header = gerrit_util.CookiesAuthenticator().get_auth_header(
  2397. 'chromium.googlesource.com')
  2398. self.assertTrue('Bearer' in header)
  2399. def test_gerrit_ensure_authenticated_non_https(self):
  2400. self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
  2401. self.calls = [
  2402. (('logging.warning',
  2403. 'Ignoring branch %(branch)s with non-https/sso remote '
  2404. '%(remote)s', {
  2405. 'branch': 'main',
  2406. 'remote': 'custom-scheme://repo'
  2407. }), None),
  2408. ]
  2409. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2410. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  2411. mock.patch('logging.warning',
  2412. lambda *a: self._mocked_call('logging.warning', *a)).start()
  2413. cl = git_cl.Changelist()
  2414. cl.branch = 'main'
  2415. cl.branchref = 'refs/heads/main'
  2416. cl.lookedup_issue = True
  2417. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2418. def test_gerrit_ensure_authenticated_non_url(self):
  2419. self.mockGit.config['remote.origin.url'] = (
  2420. 'git@somehost.example:foo/bar.git')
  2421. self.calls = [
  2422. (('logging.error',
  2423. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  2424. 'but it doesn\'t exist.', {
  2425. 'remote': 'origin',
  2426. 'branch': 'main',
  2427. 'url': 'git@somehost.example:foo/bar.git'}
  2428. ), None),
  2429. ]
  2430. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2431. CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
  2432. mock.patch('logging.error',
  2433. lambda *a: self._mocked_call('logging.error', *a)).start()
  2434. cl = git_cl.Changelist()
  2435. cl.branch = 'main'
  2436. cl.branchref = 'refs/heads/main'
  2437. cl.lookedup_issue = True
  2438. self.assertIsNone(cl.EnsureAuthenticated(force=False))
  2439. def _cmd_set_commit_gerrit_common(self, vote, notify=None):
  2440. self.mockGit.config['branch.main.gerritissue'] = '123'
  2441. self.mockGit.config['branch.main.gerritserver'] = (
  2442. 'https://chromium-review.googlesource.com')
  2443. self.mockGit.config['remote.origin.url'] = (
  2444. 'https://chromium.googlesource.com/infra/infra')
  2445. self.calls = [
  2446. (('SetReview', 'chromium-review.googlesource.com',
  2447. 'infra%2Finfra~123', None,
  2448. {'Commit-Queue': vote}, notify, None), ''),
  2449. ]
  2450. def test_cmd_set_commit_gerrit_clear(self):
  2451. self._cmd_set_commit_gerrit_common(0)
  2452. self.assertEqual(0, git_cl.main(['set-commit', '-c']))
  2453. def test_cmd_set_commit_gerrit_dry(self):
  2454. self._cmd_set_commit_gerrit_common(1, notify=False)
  2455. self.assertEqual(0, git_cl.main(['set-commit', '-d']))
  2456. def test_cmd_set_commit_gerrit(self):
  2457. self._cmd_set_commit_gerrit_common(2)
  2458. self.assertEqual(0, git_cl.main(['set-commit']))
  2459. def test_description_display(self):
  2460. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2461. ChangelistMock.desc = 'foo\n'
  2462. self.assertEqual(0, git_cl.main(['description', '-d']))
  2463. self.assertEqual('foo\n', sys.stdout.getvalue())
  2464. @mock.patch('sys.stderr', StringIO())
  2465. def test_StatusFieldOverrideIssueMissingArgs(self):
  2466. try:
  2467. self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
  2468. except SystemExitMock:
  2469. self.assertIn(
  2470. '--field must be given when --issue is set.', sys.stderr.getvalue())
  2471. def test_StatusFieldOverrideIssue(self):
  2472. def assertIssue(cl_self, *_args):
  2473. self.assertEqual(cl_self.issue, 1)
  2474. return 'foobar'
  2475. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  2476. self.assertEqual(
  2477. git_cl.main(['status', '--issue', '1', '--field', 'desc']),
  2478. 0)
  2479. self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
  2480. def test_SetCloseOverrideIssue(self):
  2481. def assertIssue(cl_self, *_args):
  2482. self.assertEqual(cl_self.issue, 1)
  2483. return 'foobar'
  2484. mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
  2485. mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
  2486. self.assertEqual(
  2487. git_cl.main(['set-close', '--issue', '1']), 0)
  2488. def test_description(self):
  2489. self.mockGit.config['remote.origin.url'] = (
  2490. 'https://chromium.googlesource.com/my/repo')
  2491. gerrit_util.GetChangeDetail.return_value = {
  2492. 'current_revision': 'sha1',
  2493. 'revisions': {'sha1': {
  2494. 'commit': {'message': 'foobar'},
  2495. }},
  2496. }
  2497. self.assertEqual(0, git_cl.main([
  2498. 'description',
  2499. 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
  2500. '-d']))
  2501. self.assertEqual('foobar\n', sys.stdout.getvalue())
  2502. def test_description_set_raw(self):
  2503. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2504. mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
  2505. self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
  2506. self.assertEqual('hihi', ChangelistMock.desc)
  2507. def test_description_appends_bug_line(self):
  2508. current_desc = 'Some.\n\nChange-Id: xxx'
  2509. def RunEditor(desc, _, **kwargs):
  2510. self.assertEqual(
  2511. '# Enter a description of the change.\n'
  2512. '# This will be displayed on the codereview site.\n'
  2513. '# The first line will also be used as the subject of the review.\n'
  2514. '#--------------------This line is 72 characters long'
  2515. '--------------------\n'
  2516. 'Some.\n\nChange-Id: xxx\nBug: ',
  2517. desc)
  2518. # Simulate user changing something.
  2519. return 'Some.\n\nChange-Id: xxx\nBug: 123'
  2520. def UpdateDescription(_, desc, force=False):
  2521. self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
  2522. mock.patch('git_cl.Changelist.FetchDescription',
  2523. lambda *args: current_desc).start()
  2524. mock.patch('git_cl.Changelist.UpdateDescription',
  2525. UpdateDescription).start()
  2526. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  2527. self.mockGit.config['branch.main.gerritissue'] = '123'
  2528. self.assertEqual(0, git_cl.main(['description']))
  2529. def test_description_does_not_append_bug_line_if_fixed_is_present(self):
  2530. current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
  2531. def RunEditor(desc, _, **kwargs):
  2532. self.assertEqual(
  2533. '# Enter a description of the change.\n'
  2534. '# This will be displayed on the codereview site.\n'
  2535. '# The first line will also be used as the subject of the review.\n'
  2536. '#--------------------This line is 72 characters long'
  2537. '--------------------\n'
  2538. 'Some.\n\nFixed: 123\nChange-Id: xxx',
  2539. desc)
  2540. return desc
  2541. mock.patch('git_cl.Changelist.FetchDescription',
  2542. lambda *args: current_desc).start()
  2543. mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
  2544. self.mockGit.config['branch.main.gerritissue'] = '123'
  2545. self.assertEqual(0, git_cl.main(['description']))
  2546. def test_description_set_stdin(self):
  2547. mock.patch('git_cl.Changelist', ChangelistMock).start()
  2548. mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
  2549. self.assertEqual(0, git_cl.main(['description', '-n', '-']))
  2550. self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
  2551. def test_archive(self):
  2552. self.calls = [
  2553. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2554. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2555. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2556. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
  2557. ((['git', 'branch', '-D', 'foo'],), '')
  2558. ]
  2559. mock.patch('git_cl.get_cl_statuses',
  2560. lambda branches, fine_grained, max_processes:
  2561. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2562. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2563. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2564. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2565. def test_archive_tag_collision(self):
  2566. self.calls = [
  2567. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2568. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2569. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
  2570. 'refs/tags/git-cl-archived-456-foo'),
  2571. ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
  2572. ((['git', 'branch', '-D', 'foo'],), '')
  2573. ]
  2574. mock.patch('git_cl.get_cl_statuses',
  2575. lambda branches, fine_grained, max_processes:
  2576. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2577. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2578. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2579. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2580. def test_archive_current_branch_fails(self):
  2581. self.calls = [
  2582. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2583. 'refs/heads/main'),
  2584. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2585. ]
  2586. mock.patch('git_cl.get_cl_statuses',
  2587. lambda branches, fine_grained, max_processes:
  2588. [(MockChangelistWithBranchAndIssue('main', 1),
  2589. 'closed')]).start()
  2590. self.assertEqual(1, git_cl.main(['archive', '-f']))
  2591. def test_archive_dry_run(self):
  2592. self.calls = [
  2593. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2594. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2595. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2596. ]
  2597. mock.patch('git_cl.get_cl_statuses',
  2598. lambda branches, fine_grained, max_processes:
  2599. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2600. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2601. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2602. self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
  2603. def test_archive_no_tags(self):
  2604. self.calls = [
  2605. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2606. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2607. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2608. ((['git', 'branch', '-D', 'foo'],), '')
  2609. ]
  2610. mock.patch('git_cl.get_cl_statuses',
  2611. lambda branches, fine_grained, max_processes:
  2612. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2613. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2614. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2615. self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
  2616. def test_archive_tag_cleanup_on_branch_deletion_error(self):
  2617. self.calls = [
  2618. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
  2619. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2620. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
  2621. ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
  2622. 'refs/tags/git-cl-archived-456-foo'),
  2623. ((['git', 'branch', '-D', 'foo'],), CERR1),
  2624. ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
  2625. 'refs/tags/git-cl-archived-456-foo'),
  2626. ]
  2627. mock.patch('git_cl.get_cl_statuses',
  2628. lambda branches, fine_grained, max_processes:
  2629. [(MockChangelistWithBranchAndIssue('main', 1), 'open'),
  2630. (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
  2631. (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
  2632. self.assertEqual(0, git_cl.main(['archive', '-f']))
  2633. def test_archive_with_format(self):
  2634. self.calls = [
  2635. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
  2636. 'refs/heads/main\nrefs/heads/foo\nrefs/heads/bar'),
  2637. ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
  2638. ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
  2639. ((['git', 'branch', '-D', 'foo'], ), ''),
  2640. ]
  2641. mock.patch('git_cl.get_cl_statuses',
  2642. lambda branches, fine_grained, max_processes:
  2643. [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
  2644. self.assertEqual(
  2645. 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
  2646. def test_cmd_issue_erase_existing(self):
  2647. self.mockGit.config['branch.main.gerritissue'] = '123'
  2648. self.mockGit.config['branch.main.gerritserver'] = (
  2649. 'https://chromium-review.googlesource.com')
  2650. self.calls = [
  2651. ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
  2652. ]
  2653. self.assertEqual(0, git_cl.main(['issue', '0']))
  2654. self.assertNotIn('branch.main.gerritissue', self.mockGit.config)
  2655. self.assertNotIn('branch.main.gerritserver', self.mockGit.config)
  2656. def test_cmd_issue_erase_existing_with_change_id(self):
  2657. self.mockGit.config['branch.main.gerritissue'] = '123'
  2658. self.mockGit.config['branch.main.gerritserver'] = (
  2659. 'https://chromium-review.googlesource.com')
  2660. mock.patch('git_cl.Changelist.FetchDescription',
  2661. lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
  2662. self.calls = [
  2663. ((['git', 'log', '-1', '--format=%B'],),
  2664. 'This is a description\n\nChange-Id: Ideadbeef'),
  2665. ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
  2666. ]
  2667. self.assertEqual(0, git_cl.main(['issue', '0']))
  2668. self.assertNotIn('branch.main.gerritissue', self.mockGit.config)
  2669. self.assertNotIn('branch.main.gerritserver', self.mockGit.config)
  2670. def test_cmd_issue_json(self):
  2671. self.mockGit.config['branch.main.gerritissue'] = '123'
  2672. self.mockGit.config['branch.main.gerritserver'] = (
  2673. 'https://chromium-review.googlesource.com')
  2674. self.mockGit.config['remote.origin.url'] = (
  2675. 'https://chromium.googlesource.com/chromium/src'
  2676. )
  2677. self.calls = [(
  2678. (
  2679. 'write_json',
  2680. 'output.json',
  2681. {
  2682. 'issue': 123,
  2683. 'issue_url': 'https://chromium-review.googlesource.com/123',
  2684. 'gerrit_host': 'chromium-review.googlesource.com',
  2685. 'gerrit_project': 'chromium/src',
  2686. },
  2687. ),
  2688. '',
  2689. )]
  2690. self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
  2691. def _common_GerritCommitMsgHookCheck(self):
  2692. mock.patch(
  2693. 'git_cl.os.path.abspath',
  2694. lambda path: self._mocked_call(['abspath', path])).start()
  2695. mock.patch(
  2696. 'git_cl.os.path.exists',
  2697. lambda path: self._mocked_call(['exists', path])).start()
  2698. mock.patch(
  2699. 'git_cl.gclient_utils.FileRead',
  2700. lambda path: self._mocked_call(['FileRead', path])).start()
  2701. mock.patch(
  2702. 'git_cl.gclient_utils.rm_file_or_tree',
  2703. lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
  2704. mock.patch(
  2705. 'gclient_utils.AskForData',
  2706. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2707. return git_cl.Changelist(issue=123)
  2708. def test_GerritCommitMsgHookCheck_custom_hook(self):
  2709. cl = self._common_GerritCommitMsgHookCheck()
  2710. self.calls += [((['exists',
  2711. os.path.join('.git', 'hooks', 'commit-msg')], ), True),
  2712. ((['FileRead',
  2713. os.path.join('.git', 'hooks', 'commit-msg')], ),
  2714. '#!/bin/sh\necho "custom hook"')]
  2715. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2716. def test_GerritCommitMsgHookCheck_not_exists(self):
  2717. cl = self._common_GerritCommitMsgHookCheck()
  2718. self.calls += [
  2719. ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
  2720. ]
  2721. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2722. def test_GerritCommitMsgHookCheck(self):
  2723. cl = self._common_GerritCommitMsgHookCheck()
  2724. self.calls += [
  2725. ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
  2726. ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
  2727. '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
  2728. (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
  2729. ((['rm_file_or_tree',
  2730. os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
  2731. ]
  2732. cl._GerritCommitMsgHookCheck(offer_removal=True)
  2733. def test_GerritCmdLand(self):
  2734. self.mockGit.config['branch.main.gerritsquashhash'] = 'deadbeaf'
  2735. self.mockGit.config['branch.main.gerritserver'] = (
  2736. 'chromium-review.googlesource.com')
  2737. self.calls += [
  2738. ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
  2739. ]
  2740. cl = git_cl.Changelist(issue=123)
  2741. cl._GetChangeDetail = lambda *args, **kwargs: {
  2742. 'labels': {},
  2743. 'current_revision': 'deadbeaf',
  2744. }
  2745. cl._GetChangeCommit = lambda: {
  2746. 'commit': 'deadbeef',
  2747. 'web_links': [{'name': 'gitiles',
  2748. 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
  2749. }
  2750. cl.SubmitIssue = lambda: None
  2751. self.assertEqual(0, cl.CMDLand(force=True,
  2752. bypass_hooks=True,
  2753. verbose=True,
  2754. parallel=False,
  2755. resultdb=False,
  2756. realm=None))
  2757. self.assertIn(
  2758. 'Issue chromium-review.googlesource.com/123 has been submitted',
  2759. sys.stdout.getvalue())
  2760. self.assertIn(
  2761. 'Landed as: https://git.googlesource.com/test/+/deadbeef',
  2762. sys.stdout.getvalue())
  2763. def _mock_gerrit_changes_for_detail_cache(self):
  2764. mock.patch('git_cl.Changelist.GetGerritHost', lambda _: 'host').start()
  2765. def test_gerrit_change_detail_cache_simple(self):
  2766. self._mock_gerrit_changes_for_detail_cache()
  2767. gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
  2768. cl1 = git_cl.Changelist(issue=1)
  2769. cl1._cached_remote_url = (
  2770. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2771. cl2 = git_cl.Changelist(issue=2)
  2772. cl2._cached_remote_url = (
  2773. True, 'https://chromium.googlesource.com/ab/repo')
  2774. self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
  2775. self.assertEqual(cl1._GetChangeDetail(), 'a')
  2776. self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
  2777. def test_gerrit_change_detail_cache_options(self):
  2778. self._mock_gerrit_changes_for_detail_cache()
  2779. gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
  2780. cl = git_cl.Changelist(issue=1)
  2781. cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
  2782. self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
  2783. self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
  2784. self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
  2785. self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
  2786. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2787. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2788. self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
  2789. self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
  2790. self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
  2791. self.assertEqual(cl._GetChangeDetail(), 'cab')
  2792. def test_gerrit_description_caching(self):
  2793. gerrit_util.GetChangeDetail.return_value = {
  2794. 'current_revision': 'rev1',
  2795. 'revisions': {
  2796. 'rev1': {'commit': {'message': 'desc1'}},
  2797. },
  2798. }
  2799. self._mock_gerrit_changes_for_detail_cache()
  2800. cl = git_cl.Changelist(issue=1)
  2801. cl._cached_remote_url = (
  2802. True, 'https://chromium.googlesource.com/a/my/repo.git/')
  2803. self.assertEqual(cl.FetchDescription(), 'desc1')
  2804. self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
  2805. def test_print_current_creds(self):
  2806. class CookiesAuthenticatorMock(object):
  2807. def __init__(self):
  2808. self.gitcookies = {
  2809. 'host.googlesource.com': ('user', 'pass'),
  2810. 'host-review.googlesource.com': ('user', 'pass'),
  2811. }
  2812. self.netrc = self
  2813. self.netrc.hosts = {
  2814. 'github.com': ('user2', None, 'pass2'),
  2815. 'host2.googlesource.com': ('user3', None, 'pass'),
  2816. }
  2817. mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
  2818. CookiesAuthenticatorMock).start()
  2819. git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
  2820. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2821. ' Host\t User\t Which file',
  2822. '============================\t=====\t===========',
  2823. 'host-review.googlesource.com\t user\t.gitcookies',
  2824. ' host.googlesource.com\t user\t.gitcookies',
  2825. ' host2.googlesource.com\tuser3\t .netrc',
  2826. ])
  2827. sys.stdout.seek(0)
  2828. sys.stdout.truncate(0)
  2829. git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
  2830. self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
  2831. ' Host\tUser\t Which file',
  2832. '============================\t====\t===========',
  2833. 'host-review.googlesource.com\tuser\t.gitcookies',
  2834. ' host.googlesource.com\tuser\t.gitcookies',
  2835. ])
  2836. def _common_creds_check_mocks(self):
  2837. def exists_mock(path):
  2838. dirname = os.path.dirname(path)
  2839. if dirname == os.path.expanduser('~'):
  2840. dirname = '~'
  2841. base = os.path.basename(path)
  2842. if base in (NETRC_FILENAME, '.gitcookies'):
  2843. return self._mocked_call('os.path.exists', os.path.join(dirname, base))
  2844. # git cl also checks for existence other files not relevant to this test.
  2845. return None
  2846. mock.patch(
  2847. 'gclient_utils.AskForData',
  2848. lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
  2849. mock.patch('os.path.exists', exists_mock).start()
  2850. def test_creds_check_gitcookies_not_configured(self):
  2851. self._common_creds_check_mocks()
  2852. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2853. lambda _, include_netrc=False: []).start()
  2854. self.calls = [
  2855. ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
  2856. ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
  2857. (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
  2858. (('ask_for_data', 'Press Enter to setup .gitcookies, '
  2859. 'or Ctrl+C to abort'), ''),
  2860. (([
  2861. 'git', 'config', '--global', 'http.cookiefile',
  2862. os.path.expanduser(os.path.join('~', '.gitcookies'))
  2863. ], ), ''),
  2864. ]
  2865. self.assertEqual(0, git_cl.main(['creds-check']))
  2866. self.assertTrue(
  2867. sys.stdout.getvalue().startswith(
  2868. 'You seem to be using outdated .netrc for git credentials:'))
  2869. self.assertIn(
  2870. '\nConfigured git to use .gitcookies from',
  2871. sys.stdout.getvalue())
  2872. def test_creds_check_gitcookies_configured_custom_broken(self):
  2873. self._common_creds_check_mocks()
  2874. mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
  2875. lambda _, include_netrc=False: []).start()
  2876. custom_cookie_path = ('C:\\.gitcookies'
  2877. if sys.platform == 'win32' else '/custom/.gitcookies')
  2878. self.calls = [
  2879. ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
  2880. ((['git', 'config', '--global', 'http.cookiefile'], ),
  2881. custom_cookie_path),
  2882. (('os.path.exists', custom_cookie_path), False),
  2883. (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
  2884. 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
  2885. (([
  2886. 'git', 'config', '--global', 'http.cookiefile',
  2887. os.path.expanduser(os.path.join('~', '.gitcookies'))
  2888. ], ), ''),
  2889. ]
  2890. self.assertEqual(0, git_cl.main(['creds-check']))
  2891. self.assertIn(
  2892. 'WARNING: You have configured custom path to .gitcookies: ',
  2893. sys.stdout.getvalue())
  2894. self.assertIn(
  2895. 'However, your configured .gitcookies file is missing.',
  2896. sys.stdout.getvalue())
  2897. def test_git_cl_comment_add_gerrit(self):
  2898. self.mockGit.branchref = None
  2899. self.mockGit.config['remote.origin.url'] = (
  2900. 'https://chromium.googlesource.com/infra/infra')
  2901. self.calls = [
  2902. (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
  2903. 'msg', None, None, None),
  2904. None),
  2905. ]
  2906. self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
  2907. @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
  2908. def test_git_cl_comments_fetch_gerrit(self, *_mocks):
  2909. self.mockGit.config['remote.origin.url'] = (
  2910. 'https://chromium.googlesource.com/infra/infra')
  2911. gerrit_util.GetChangeDetail.return_value = {
  2912. 'owner': {'email': 'owner@example.com'},
  2913. 'current_revision': 'ba5eba11',
  2914. 'revisions': {
  2915. 'deadbeaf': {
  2916. '_number': 1,
  2917. },
  2918. 'ba5eba11': {
  2919. '_number': 2,
  2920. },
  2921. },
  2922. 'messages': [
  2923. {
  2924. u'_revision_number': 1,
  2925. u'author': {
  2926. u'_account_id': 1111084,
  2927. u'email': u'could-be-anything@example.com',
  2928. u'name': u'LUCI CQ'
  2929. },
  2930. u'date': u'2017-03-15 20:08:45.000000000',
  2931. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  2932. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  2933. u'tag': u'autogenerated:cv:dry-run'
  2934. },
  2935. {
  2936. u'_revision_number': 2,
  2937. u'author': {
  2938. u'_account_id': 11151243,
  2939. u'email': u'owner@example.com',
  2940. u'name': u'owner'
  2941. },
  2942. u'date': u'2017-03-16 20:00:41.000000000',
  2943. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  2944. u'message': u'PTAL',
  2945. },
  2946. {
  2947. u'_revision_number': 2,
  2948. u'author': {
  2949. u'_account_id': 148512,
  2950. u'email': u'reviewer@example.com',
  2951. u'name': u'reviewer'
  2952. },
  2953. u'date': u'2017-03-17 05:19:37.500000000',
  2954. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  2955. u'message': u'Patch Set 2: Code-Review+1',
  2956. },
  2957. {
  2958. u'_revision_number': 2,
  2959. u'author': {
  2960. u'_account_id': 42,
  2961. u'name': u'reviewer'
  2962. },
  2963. u'date': u'2017-03-17 05:19:37.900000000',
  2964. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d0000',
  2965. u'message': u'A bot with no email set',
  2966. },
  2967. ]
  2968. }
  2969. self.calls = [
  2970. (('GetChangeComments', 'chromium-review.googlesource.com',
  2971. 'infra%2Finfra~1'), {
  2972. '/COMMIT_MSG': [
  2973. {
  2974. 'author': {
  2975. 'email': u'reviewer@example.com'
  2976. },
  2977. 'updated': u'2017-03-17 05:19:37.500000000',
  2978. 'patch_set': 2,
  2979. 'side': 'REVISION',
  2980. 'message': 'Please include a bug link',
  2981. },
  2982. ],
  2983. 'codereview.settings': [
  2984. {
  2985. 'author': {
  2986. 'email': u'owner@example.com'
  2987. },
  2988. 'updated': u'2017-03-16 20:00:41.000000000',
  2989. 'patch_set': 2,
  2990. 'side': 'PARENT',
  2991. 'line': 42,
  2992. 'message': 'I removed this because it is bad',
  2993. },
  2994. ]
  2995. }),
  2996. (('GetChangeRobotComments', 'chromium-review.googlesource.com',
  2997. 'infra%2Finfra~1'), {}),
  2998. ] * 2 + [(('write_json', 'output.json', [{
  2999. u'date':
  3000. u'2017-03-16 20:00:41.000000',
  3001. u'message': (u'PTAL\n' + u'\n' + u'codereview.settings\n' +
  3002. u' Base, Line 42: https://crrev.com/c/1/2/'
  3003. u'codereview.settings#b42\n' +
  3004. u' I removed this because it is bad\n'),
  3005. u'autogenerated':
  3006. False,
  3007. u'approval':
  3008. False,
  3009. u'disapproval':
  3010. False,
  3011. u'sender':
  3012. u'owner@example.com'
  3013. }, {
  3014. u'date':
  3015. u'2017-03-17 05:19:37.500000',
  3016. u'message':
  3017. (u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
  3018. u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
  3019. u' Please include a bug link\n'),
  3020. u'autogenerated':
  3021. False,
  3022. u'approval':
  3023. False,
  3024. u'disapproval':
  3025. False,
  3026. u'sender':
  3027. u'reviewer@example.com'
  3028. }]), '')]
  3029. expected_comments_summary = [
  3030. git_cl._CommentSummary(
  3031. message=(u'PTAL\n' + u'\n' + u'codereview.settings\n' +
  3032. u' Base, Line 42: https://crrev.com/c/1/2/' +
  3033. u'codereview.settings#b42\n' +
  3034. u' I removed this because it is bad\n'),
  3035. date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
  3036. autogenerated=False,
  3037. disapproval=False,
  3038. approval=False,
  3039. sender=u'owner@example.com'),
  3040. git_cl._CommentSummary(message=(
  3041. u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
  3042. u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
  3043. u' Please include a bug link\n'),
  3044. date=datetime.datetime(2017, 3, 17, 5, 19, 37,
  3045. 500000),
  3046. autogenerated=False,
  3047. disapproval=False,
  3048. approval=False,
  3049. sender=u'reviewer@example.com'),
  3050. ]
  3051. cl = git_cl.Changelist(
  3052. issue=1, branchref='refs/heads/foo')
  3053. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  3054. self.assertEqual(
  3055. 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
  3056. def test_git_cl_comments_robot_comments(self):
  3057. # git cl comments also fetches robot comments (which are considered a type
  3058. # of autogenerated comment), and unlike other types of comments, only robot
  3059. # comments from the latest patchset are shown.
  3060. self.mockGit.config['remote.origin.url'] = (
  3061. 'https://x.googlesource.com/infra/infra')
  3062. gerrit_util.GetChangeDetail.return_value = {
  3063. 'owner': {'email': 'owner@example.com'},
  3064. 'current_revision': 'ba5eba11',
  3065. 'revisions': {
  3066. 'deadbeaf': {
  3067. '_number': 1,
  3068. },
  3069. 'ba5eba11': {
  3070. '_number': 2,
  3071. },
  3072. },
  3073. 'messages': [
  3074. {
  3075. u'_revision_number': 1,
  3076. u'author': {
  3077. u'_account_id': 1111084,
  3078. u'email': u'commit-bot@chromium.org',
  3079. u'name': u'Commit Bot'
  3080. },
  3081. u'date': u'2017-03-15 20:08:45.000000000',
  3082. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
  3083. u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
  3084. u'tag': u'autogenerated:cq:dry-run'
  3085. },
  3086. {
  3087. u'_revision_number': 1,
  3088. u'author': {
  3089. u'_account_id': 123,
  3090. u'email': u'tricium@serviceaccount.com',
  3091. u'name': u'Tricium'
  3092. },
  3093. u'date': u'2017-03-16 20:00:41.000000000',
  3094. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  3095. u'message': u'(1 comment)',
  3096. u'tag': u'autogenerated:tricium',
  3097. },
  3098. {
  3099. u'_revision_number': 1,
  3100. u'author': {
  3101. u'_account_id': 123,
  3102. u'email': u'tricium@serviceaccount.com',
  3103. u'name': u'Tricium'
  3104. },
  3105. u'date': u'2017-03-16 20:00:41.000000000',
  3106. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
  3107. u'message': u'(1 comment)',
  3108. u'tag': u'autogenerated:tricium',
  3109. },
  3110. {
  3111. u'_revision_number': 2,
  3112. u'author': {
  3113. u'_account_id': 123,
  3114. u'email': u'tricium@serviceaccount.com',
  3115. u'name': u'reviewer'
  3116. },
  3117. u'date': u'2017-03-17 05:30:37.000000000',
  3118. u'tag': u'autogenerated:tricium',
  3119. u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
  3120. u'message': u'(1 comment)',
  3121. },
  3122. ]
  3123. }
  3124. self.calls = [
  3125. (('GetChangeComments', 'x-review.googlesource.com', 'infra%2Finfra~1'),
  3126. {}),
  3127. (('GetChangeRobotComments', 'x-review.googlesource.com',
  3128. 'infra%2Finfra~1'), {
  3129. 'codereview.settings': [
  3130. {
  3131. u'author': {
  3132. u'email': u'tricium@serviceaccount.com'
  3133. },
  3134. u'updated': u'2017-03-17 05:30:37.000000000',
  3135. u'robot_run_id': u'5565031076855808',
  3136. u'robot_id': u'Linter/Category',
  3137. u'tag': u'autogenerated:tricium',
  3138. u'patch_set': 2,
  3139. u'side': u'REVISION',
  3140. u'message': u'Linter warning message text',
  3141. u'line': 32,
  3142. },
  3143. ],
  3144. }),
  3145. ]
  3146. expected_comments_summary = [
  3147. git_cl._CommentSummary(
  3148. date=datetime.datetime(2017, 3, 17, 5, 30, 37),
  3149. message=(u'(1 comment)\n\ncodereview.settings\n'
  3150. u' PS2, Line 32: https://x-review.googlesource.com/c/1/2/'
  3151. u'codereview.settings#32\n'
  3152. u' Linter warning message text\n'),
  3153. sender=u'tricium@serviceaccount.com',
  3154. autogenerated=True,
  3155. approval=False,
  3156. disapproval=False)
  3157. ]
  3158. cl = git_cl.Changelist(
  3159. issue=1, branchref='refs/heads/foo')
  3160. self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
  3161. def test_get_remote_url_with_mirror(self):
  3162. original_os_path_isdir = os.path.isdir
  3163. def selective_os_path_isdir_mock(path):
  3164. if path == '/cache/this-dir-exists':
  3165. return self._mocked_call('os.path.isdir', path)
  3166. return original_os_path_isdir(path)
  3167. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3168. url = 'https://chromium.googlesource.com/my/repo'
  3169. self.mockGit.config['remote.origin.url'] = (
  3170. '/cache/this-dir-exists')
  3171. self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
  3172. url)
  3173. self.calls = [
  3174. (('os.path.isdir', '/cache/this-dir-exists'),
  3175. True),
  3176. ]
  3177. cl = git_cl.Changelist(issue=1)
  3178. self.assertEqual(cl.GetRemoteUrl(), url)
  3179. self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
  3180. def test_get_remote_url_non_existing_mirror(self):
  3181. original_os_path_isdir = os.path.isdir
  3182. def selective_os_path_isdir_mock(path):
  3183. if path == '/cache/this-dir-doesnt-exist':
  3184. return self._mocked_call('os.path.isdir', path)
  3185. return original_os_path_isdir(path)
  3186. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3187. mock.patch('logging.error',
  3188. lambda *a: self._mocked_call('logging.error', *a)).start()
  3189. self.mockGit.config['remote.origin.url'] = (
  3190. '/cache/this-dir-doesnt-exist')
  3191. self.calls = [
  3192. (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
  3193. False),
  3194. (('logging.error',
  3195. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  3196. 'but it doesn\'t exist.', {
  3197. 'remote': 'origin',
  3198. 'branch': 'main',
  3199. 'url': '/cache/this-dir-doesnt-exist'}
  3200. ), None),
  3201. ]
  3202. cl = git_cl.Changelist(issue=1)
  3203. self.assertIsNone(cl.GetRemoteUrl())
  3204. def test_get_remote_url_misconfigured_mirror(self):
  3205. original_os_path_isdir = os.path.isdir
  3206. def selective_os_path_isdir_mock(path):
  3207. if path == '/cache/this-dir-exists':
  3208. return self._mocked_call('os.path.isdir', path)
  3209. return original_os_path_isdir(path)
  3210. mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
  3211. mock.patch('logging.error',
  3212. lambda *a: self._mocked_call('logging.error', *a)).start()
  3213. self.mockGit.config['remote.origin.url'] = (
  3214. '/cache/this-dir-exists')
  3215. self.calls = [
  3216. (('os.path.isdir', '/cache/this-dir-exists'), True),
  3217. (('logging.error',
  3218. 'Remote "%(remote)s" for branch "%(branch)s" points to '
  3219. '"%(cache_path)s", but it is misconfigured.\n'
  3220. '"%(cache_path)s" must be a git repo and must have a remote named '
  3221. '"%(remote)s" pointing to the git host.', {
  3222. 'remote': 'origin',
  3223. 'cache_path': '/cache/this-dir-exists',
  3224. 'branch': 'main'}
  3225. ), None),
  3226. ]
  3227. cl = git_cl.Changelist(issue=1)
  3228. self.assertIsNone(cl.GetRemoteUrl())
  3229. def test_gerrit_change_identifier_with_project(self):
  3230. self.mockGit.config['remote.origin.url'] = (
  3231. 'https://chromium.googlesource.com/a/my/repo.git/')
  3232. cl = git_cl.Changelist(issue=123456)
  3233. self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
  3234. def test_gerrit_change_identifier_without_project(self):
  3235. mock.patch('logging.error',
  3236. lambda *a: self._mocked_call('logging.error', *a)).start()
  3237. self.calls = [
  3238. (('logging.error',
  3239. 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
  3240. 'but it doesn\'t exist.', {
  3241. 'remote': 'origin',
  3242. 'branch': 'main',
  3243. 'url': ''}
  3244. ), None),
  3245. ]
  3246. cl = git_cl.Changelist(issue=123456)
  3247. self.assertEqual(cl._GerritChangeIdentifier(), '123456')
  3248. def test_gerrit_new_default(self):
  3249. self._run_gerrit_upload_test(
  3250. [],
  3251. 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
  3252. [],
  3253. squash=False,
  3254. squash_mode='override_nosquash',
  3255. change_id='I123456789',
  3256. default_branch='main')
  3257. class ChangelistTest(unittest.TestCase):
  3258. LAST_COMMIT_SUBJECT = 'Fixes goat teleporter destination to be Australia'
  3259. def _mock_run_git(commands):
  3260. if commands == ['show', '-s', '--format=%s', 'HEAD']:
  3261. return ChangelistTest.LAST_COMMIT_SUBJECT
  3262. def setUp(self):
  3263. super(ChangelistTest, self).setUp()
  3264. mock.patch('gclient_utils.FileRead').start()
  3265. mock.patch('gclient_utils.FileWrite').start()
  3266. mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
  3267. mock.patch(
  3268. 'git_cl.Changelist.GetCodereviewServer',
  3269. return_value='https://chromium-review.googlesource.com').start()
  3270. mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
  3271. mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
  3272. mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
  3273. mock.patch(
  3274. 'git_cl.Changelist.GetRemoteBranch',
  3275. return_value=('origin', 'refs/remotes/origin/main')).start()
  3276. mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
  3277. mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
  3278. mock.patch('git_cl.Settings.GetIsGerrit', return_value=True).start()
  3279. mock.patch('git_cl.time_time').start()
  3280. mock.patch('metrics.collector').start()
  3281. mock.patch('subprocess2.Popen').start()
  3282. mock.patch(
  3283. 'git_cl.Changelist.GetGerritProject', return_value='project').start()
  3284. mock.patch('sys.exit', side_effect=SystemExitMock).start()
  3285. self.addCleanup(mock.patch.stopall)
  3286. self.temp_count = 0
  3287. self.mockGit = GitMocks()
  3288. mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
  3289. mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
  3290. def testRunHook(self):
  3291. expected_results = {
  3292. 'more_cc': ['cc@example.com', 'more@example.com'],
  3293. 'errors': [],
  3294. 'notifications': [],
  3295. 'warnings': [],
  3296. }
  3297. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3298. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3299. mockProcess = mock.Mock()
  3300. mockProcess.wait.return_value = 0
  3301. subprocess2.Popen.return_value = mockProcess
  3302. cl = git_cl.Changelist()
  3303. results = cl.RunHook(
  3304. committing=True,
  3305. may_prompt=True,
  3306. verbose=2,
  3307. parallel=True,
  3308. upstream='upstream',
  3309. description='description',
  3310. all_files=True,
  3311. resultdb=False)
  3312. self.assertEqual(expected_results, results)
  3313. subprocess2.Popen.assert_any_call([
  3314. 'vpython3', 'PRESUBMIT_SUPPORT',
  3315. '--root', 'root',
  3316. '--upstream', 'upstream',
  3317. '--verbose', '--verbose',
  3318. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3319. '--gerrit_project', 'project',
  3320. '--gerrit_branch', 'refs/heads/main',
  3321. '--author', 'author',
  3322. '--issue', '123456',
  3323. '--patchset', '7',
  3324. '--commit',
  3325. '--may_prompt',
  3326. '--parallel',
  3327. '--all_files',
  3328. '--no_diffs',
  3329. '--json_output', '/tmp/fake-temp2',
  3330. '--description_file', '/tmp/fake-temp1',
  3331. ])
  3332. gclient_utils.FileWrite.assert_any_call(
  3333. '/tmp/fake-temp1', 'description')
  3334. metrics.collector.add_repeated('sub_commands', {
  3335. 'command': 'presubmit',
  3336. 'execution_time': 100,
  3337. 'exit_code': 0,
  3338. })
  3339. def testRunHook_FewerOptions(self):
  3340. expected_results = {
  3341. 'more_cc': ['cc@example.com', 'more@example.com'],
  3342. 'errors': [],
  3343. 'notifications': [],
  3344. 'warnings': [],
  3345. }
  3346. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3347. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3348. mockProcess = mock.Mock()
  3349. mockProcess.wait.return_value = 0
  3350. subprocess2.Popen.return_value = mockProcess
  3351. git_cl.Changelist.GetAuthor.return_value = None
  3352. git_cl.Changelist.GetIssue.return_value = None
  3353. git_cl.Changelist.GetPatchset.return_value = None
  3354. cl = git_cl.Changelist()
  3355. results = cl.RunHook(
  3356. committing=False,
  3357. may_prompt=False,
  3358. verbose=0,
  3359. parallel=False,
  3360. upstream='upstream',
  3361. description='description',
  3362. all_files=False,
  3363. resultdb=False)
  3364. self.assertEqual(expected_results, results)
  3365. subprocess2.Popen.assert_any_call([
  3366. 'vpython3', 'PRESUBMIT_SUPPORT',
  3367. '--root', 'root',
  3368. '--upstream', 'upstream',
  3369. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3370. '--gerrit_project', 'project',
  3371. '--gerrit_branch', 'refs/heads/main',
  3372. '--upload',
  3373. '--json_output', '/tmp/fake-temp2',
  3374. '--description_file', '/tmp/fake-temp1',
  3375. ])
  3376. gclient_utils.FileWrite.assert_any_call(
  3377. '/tmp/fake-temp1', 'description')
  3378. metrics.collector.add_repeated('sub_commands', {
  3379. 'command': 'presubmit',
  3380. 'execution_time': 100,
  3381. 'exit_code': 0,
  3382. })
  3383. def testRunHook_FewerOptionsResultDB(self):
  3384. expected_results = {
  3385. 'more_cc': ['cc@example.com', 'more@example.com'],
  3386. 'errors': [],
  3387. 'notifications': [],
  3388. 'warnings': [],
  3389. }
  3390. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3391. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3392. mockProcess = mock.Mock()
  3393. mockProcess.wait.return_value = 0
  3394. subprocess2.Popen.return_value = mockProcess
  3395. git_cl.Changelist.GetAuthor.return_value = None
  3396. git_cl.Changelist.GetIssue.return_value = None
  3397. git_cl.Changelist.GetPatchset.return_value = None
  3398. cl = git_cl.Changelist()
  3399. results = cl.RunHook(
  3400. committing=False,
  3401. may_prompt=False,
  3402. verbose=0,
  3403. parallel=False,
  3404. upstream='upstream',
  3405. description='description',
  3406. all_files=False,
  3407. resultdb=True,
  3408. realm='chromium:public')
  3409. self.assertEqual(expected_results, results)
  3410. subprocess2.Popen.assert_any_call([
  3411. 'rdb', 'stream', '-new', '-realm', 'chromium:public', '--',
  3412. 'vpython3', 'PRESUBMIT_SUPPORT',
  3413. '--root', 'root',
  3414. '--upstream', 'upstream',
  3415. '--gerrit_url', 'https://chromium-review.googlesource.com',
  3416. '--gerrit_project', 'project',
  3417. '--gerrit_branch', 'refs/heads/main',
  3418. '--upload',
  3419. '--json_output', '/tmp/fake-temp2',
  3420. '--description_file', '/tmp/fake-temp1',
  3421. ])
  3422. def testRunHook_NoGerrit(self):
  3423. mock.patch('git_cl.Settings.GetIsGerrit', return_value=False).start()
  3424. expected_results = {
  3425. 'more_cc': ['cc@example.com', 'more@example.com'],
  3426. 'errors': [],
  3427. 'notifications': [],
  3428. 'warnings': [],
  3429. }
  3430. gclient_utils.FileRead.return_value = json.dumps(expected_results)
  3431. git_cl.time_time.side_effect = [100, 200, 300, 400]
  3432. mockProcess = mock.Mock()
  3433. mockProcess.wait.return_value = 0
  3434. subprocess2.Popen.return_value = mockProcess
  3435. git_cl.Changelist.GetAuthor.return_value = None
  3436. git_cl.Changelist.GetIssue.return_value = None
  3437. git_cl.Changelist.GetPatchset.return_value = None
  3438. cl = git_cl.Changelist()
  3439. results = cl.RunHook(
  3440. committing=False,
  3441. may_prompt=False,
  3442. verbose=0,
  3443. parallel=False,
  3444. upstream='upstream',
  3445. description='description',
  3446. all_files=False,
  3447. resultdb=False)
  3448. self.assertEqual(expected_results, results)
  3449. subprocess2.Popen.assert_any_call([
  3450. 'vpython3', 'PRESUBMIT_SUPPORT',
  3451. '--root', 'root',
  3452. '--upstream', 'upstream',
  3453. '--upload',
  3454. '--json_output', '/tmp/fake-temp2',
  3455. '--description_file', '/tmp/fake-temp1',
  3456. ])
  3457. gclient_utils.FileWrite.assert_any_call(
  3458. '/tmp/fake-temp1', 'description')
  3459. metrics.collector.add_repeated('sub_commands', {
  3460. 'command': 'presubmit',
  3461. 'execution_time': 100,
  3462. 'exit_code': 0,
  3463. })
  3464. @mock.patch('sys.exit', side_effect=SystemExitMock)
  3465. def testRunHook_Failure(self, _mock):
  3466. git_cl.time_time.side_effect = [100, 200]
  3467. mockProcess = mock.Mock()
  3468. mockProcess.wait.return_value = 2
  3469. subprocess2.Popen.return_value = mockProcess
  3470. cl = git_cl.Changelist()
  3471. with self.assertRaises(SystemExitMock):
  3472. cl.RunHook(
  3473. committing=True,
  3474. may_prompt=True,
  3475. verbose=2,
  3476. parallel=True,
  3477. upstream='upstream',
  3478. description='description',
  3479. all_files=True,
  3480. resultdb=False)
  3481. sys.exit.assert_called_once_with(2)
  3482. def testRunPostUploadHook(self):
  3483. cl = git_cl.Changelist()
  3484. cl.RunPostUploadHook(2, 'upstream', 'description')
  3485. subprocess2.Popen.assert_called_with([
  3486. 'vpython3',
  3487. 'PRESUBMIT_SUPPORT',
  3488. '--root',
  3489. 'root',
  3490. '--upstream',
  3491. 'upstream',
  3492. '--verbose',
  3493. '--verbose',
  3494. '--gerrit_url',
  3495. 'https://chromium-review.googlesource.com',
  3496. '--gerrit_project',
  3497. 'project',
  3498. '--gerrit_branch',
  3499. 'refs/heads/main',
  3500. '--author',
  3501. 'author',
  3502. '--issue',
  3503. '123456',
  3504. '--patchset',
  3505. '7',
  3506. '--post_upload',
  3507. '--description_file',
  3508. '/tmp/fake-temp1',
  3509. ])
  3510. gclient_utils.FileWrite.assert_called_once_with(
  3511. '/tmp/fake-temp1', 'description')
  3512. def testRunPostUploadHookPy3Only(self):
  3513. cl = git_cl.Changelist()
  3514. cl.RunPostUploadHook(2, 'upstream', 'description')
  3515. subprocess2.Popen.assert_called_once_with([
  3516. 'vpython3',
  3517. 'PRESUBMIT_SUPPORT',
  3518. '--root',
  3519. 'root',
  3520. '--upstream',
  3521. 'upstream',
  3522. '--verbose',
  3523. '--verbose',
  3524. '--gerrit_url',
  3525. 'https://chromium-review.googlesource.com',
  3526. '--gerrit_project',
  3527. 'project',
  3528. '--gerrit_branch',
  3529. 'refs/heads/main',
  3530. '--author',
  3531. 'author',
  3532. '--issue',
  3533. '123456',
  3534. '--patchset',
  3535. '7',
  3536. '--post_upload',
  3537. '--description_file',
  3538. '/tmp/fake-temp1',
  3539. ])
  3540. gclient_utils.FileWrite.assert_called_once_with('/tmp/fake-temp1',
  3541. 'description')
  3542. @mock.patch('git_cl.RunGit', _mock_run_git)
  3543. def testDefaultTitleEmptyMessage(self):
  3544. cl = git_cl.Changelist()
  3545. cl.issue = 100
  3546. options = optparse.Values({
  3547. 'squash': True,
  3548. 'title': None,
  3549. 'message': None,
  3550. 'force': None,
  3551. 'skip_title': None
  3552. })
  3553. mock.patch('gclient_utils.AskForData', lambda _: user_title).start()
  3554. for user_title in ['', 'y', 'Y']:
  3555. self.assertEqual(cl._GetTitleForUpload(options), self.LAST_COMMIT_SUBJECT)
  3556. for user_title in ['not empty', 'yes', 'YES']:
  3557. self.assertEqual(cl._GetTitleForUpload(options), user_title)
  3558. @mock.patch('git_cl.Changelist.GetMostRecentPatchset', return_value=2)
  3559. @mock.patch('git_cl.RunGit')
  3560. @mock.patch('git_cl.Changelist._PrepareChange')
  3561. def testPrepareSquashedCommit(self, mockPrepareChange, mockRunGit, *_mocks):
  3562. change_desc = git_cl.ChangeDescription('BOO!')
  3563. reviewers = []
  3564. ccs = []
  3565. mockPrepareChange.return_value = (reviewers, ccs, change_desc)
  3566. parent_hash = 'upstream-gerrit-hash'
  3567. parent_orig_hash = 'upstream-last-upload-hash'
  3568. parent_hash_root = 'root-commit'
  3569. hash_to_push = 'new-squash-hash'
  3570. hash_to_push_root = 'new-squash-hash-root'
  3571. branchref = 'refs/heads/current-branch'
  3572. end_hash = 'end-hash'
  3573. tree_hash = 'tree-hash'
  3574. def mock_run_git(commands):
  3575. if {'commit-tree', tree_hash, '-p', parent_hash,
  3576. '-F'}.issubset(set(commands)):
  3577. return hash_to_push
  3578. if {'commit-tree', tree_hash, '-p', parent_hash_root,
  3579. '-F'}.issubset(set(commands)):
  3580. return hash_to_push_root
  3581. if commands == ['rev-parse', branchref]:
  3582. return end_hash
  3583. if commands == ['rev-parse', end_hash + ':']:
  3584. return tree_hash
  3585. mockRunGit.side_effect = mock_run_git
  3586. cl = git_cl.Changelist(branchref=branchref)
  3587. options = optparse.Values()
  3588. new_upload = cl.PrepareSquashedCommit(options, parent_hash,
  3589. parent_orig_hash)
  3590. self.assertEqual(new_upload.reviewers, reviewers)
  3591. self.assertEqual(new_upload.ccs, ccs)
  3592. self.assertEqual(new_upload.commit_to_push, hash_to_push)
  3593. self.assertEqual(new_upload.new_last_uploaded_commit, end_hash)
  3594. self.assertEqual(new_upload.change_desc, change_desc)
  3595. mockPrepareChange.assert_called_with(options, parent_orig_hash, end_hash)
  3596. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  3597. @mock.patch('git_cl.Changelist.GetMostRecentPatchset', return_value=2)
  3598. @mock.patch('git_cl.RunGitWithCode')
  3599. @mock.patch('git_cl.RunGit')
  3600. @mock.patch('git_cl.Changelist._PrepareChange')
  3601. @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
  3602. def testPrepareCherryPickSquashedCommit(self,
  3603. mockGetCommonAncestorWithUpstream,
  3604. mockPrepareChange, mockRunGit,
  3605. mockRunGitWithCode, *_mocks):
  3606. cherry_pick_base_hash = '1a2bcherrypickbase'
  3607. mockGetCommonAncestorWithUpstream.return_value = cherry_pick_base_hash
  3608. change_desc = git_cl.ChangeDescription('BOO!')
  3609. ccs = ['cc@review.cl']
  3610. reviewers = ['reviewer@review.cl']
  3611. mockPrepareChange.return_value = (reviewers, ccs, change_desc)
  3612. branchref = 'refs/heads/current-branch'
  3613. cl = git_cl.Changelist(branchref=branchref)
  3614. options = optparse.Values()
  3615. upstream_gerrit_hash = 'upstream-gerrit-hash'
  3616. latest_tree_hash = 'tree-hash'
  3617. hash_to_cp = 'squashed-hash'
  3618. hash_to_push = 'hash-to-push'
  3619. hash_to_save_as_last_upload = 'last-upload'
  3620. def mock_run_git(commands):
  3621. if commands == ['rev-parse', branchref]:
  3622. return hash_to_save_as_last_upload
  3623. if commands == ['rev-parse', branchref + ':']:
  3624. return latest_tree_hash
  3625. if {'commit-tree', latest_tree_hash, '-p', cherry_pick_base_hash,
  3626. '-F'}.issubset(set(commands)):
  3627. return hash_to_cp
  3628. if commands == ['rev-parse', 'HEAD']:
  3629. return hash_to_push
  3630. mockRunGit.side_effect = mock_run_git
  3631. def mock_run_git_with_code(commands):
  3632. if commands == ['cherry-pick', hash_to_cp]:
  3633. return 0, ''
  3634. mockRunGitWithCode.side_effect = mock_run_git_with_code
  3635. new_upload = cl.PrepareCherryPickSquashedCommit(options,
  3636. upstream_gerrit_hash)
  3637. self.assertEqual(new_upload.reviewers, reviewers)
  3638. self.assertEqual(new_upload.ccs, ccs)
  3639. self.assertEqual(new_upload.commit_to_push, hash_to_push)
  3640. self.assertEqual(new_upload.new_last_uploaded_commit,
  3641. hash_to_save_as_last_upload)
  3642. self.assertEqual(new_upload.change_desc, change_desc)
  3643. # Test failed cherry-pick
  3644. def mock_run_git_with_code(commands):
  3645. if commands == ['cherry-pick', hash_to_cp]:
  3646. return 1, ''
  3647. mockRunGitWithCode.side_effect = mock_run_git_with_code
  3648. with self.assertRaises(SystemExitMock):
  3649. cl.PrepareCherryPickSquashedCommit(options, cherry_pick_base_hash)
  3650. @mock.patch('git_cl.Settings.GetDefaultCCList', return_value=[])
  3651. @mock.patch('git_cl.Changelist.GetAffectedFiles', return_value=[])
  3652. @mock.patch('git_cl.GenerateGerritChangeId', return_value='1a2b3c')
  3653. @mock.patch('git_cl.Changelist.GetIssue', return_value=None)
  3654. @mock.patch('git_cl.ChangeDescription.prompt')
  3655. @mock.patch('git_cl.Changelist.RunHook')
  3656. @mock.patch('git_cl.Changelist._GetDescriptionForUpload')
  3657. @mock.patch('git_cl.Changelist.EnsureCanUploadPatchset')
  3658. def testPrepareChange_new(self, mockEnsureCanUploadPatchset,
  3659. mockGetDescriptionForupload, mockRunHook,
  3660. mockPrompt, *_mocks):
  3661. options = optparse.Values()
  3662. options.force = False
  3663. options.bypass_hooks = False
  3664. options.verbose = False
  3665. options.parallel = False
  3666. options.preserve_tryjobs = False
  3667. options.private = False
  3668. options.no_autocc = False
  3669. options.message_file = None
  3670. options.cc = ['chicken@bok.farm']
  3671. parent = '420parent'
  3672. latest_tree = '420latest_tree'
  3673. mockRunHook.return_value = {'more_cc': ['cow@moo.farm']}
  3674. desc = 'AH!\nCC=cow2@moo.farm\nR=horse@apple.farm'
  3675. mockGetDescriptionForupload.return_value = git_cl.ChangeDescription(desc)
  3676. cl = git_cl.Changelist()
  3677. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3678. latest_tree)
  3679. self.assertEqual(reviewers, ['horse@apple.farm'])
  3680. self.assertEqual(ccs, ['cow@moo.farm', 'chicken@bok.farm', 'cow2@moo.farm'])
  3681. self.assertEqual(change_desc._description_lines, [
  3682. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '', 'Change-Id: 1a2b3c'
  3683. ])
  3684. mockPrompt.assert_called_once()
  3685. mockEnsureCanUploadPatchset.assert_called_once()
  3686. mockRunHook.assert_called_once_with(committing=False,
  3687. may_prompt=True,
  3688. verbose=False,
  3689. parallel=False,
  3690. upstream='420parent',
  3691. description=desc,
  3692. all_files=False)
  3693. @mock.patch('git_cl.Changelist.GetAffectedFiles', return_value=[])
  3694. @mock.patch('git_cl.Changelist.GetIssue', return_value='123')
  3695. @mock.patch('git_cl.ChangeDescription.prompt')
  3696. @mock.patch('gerrit_util.GetChangeDetail')
  3697. @mock.patch('git_cl.Changelist.RunHook')
  3698. @mock.patch('git_cl.Changelist._GetDescriptionForUpload')
  3699. @mock.patch('git_cl.Changelist.EnsureCanUploadPatchset')
  3700. def testPrepareChange_existing(self, mockEnsureCanUploadPatchset,
  3701. mockGetDescriptionForupload, mockRunHook,
  3702. mockGetChangeDetail, mockPrompt, *_mocks):
  3703. cl = git_cl.Changelist()
  3704. options = optparse.Values()
  3705. options.force = False
  3706. options.bypass_hooks = False
  3707. options.verbose = False
  3708. options.parallel = False
  3709. options.edit_description = False
  3710. options.preserve_tryjobs = False
  3711. options.private = False
  3712. options.no_autocc = False
  3713. options.cc = ['chicken@bok.farm']
  3714. parent = '420parent'
  3715. latest_tree = '420latest_tree'
  3716. mockRunHook.return_value = {'more_cc': ['cow@moo.farm']}
  3717. desc = 'AH!\nCC=cow2@moo.farm\nR=horse@apple.farm'
  3718. mockGetDescriptionForupload.return_value = git_cl.ChangeDescription(desc)
  3719. # Existing change
  3720. gerrit_util.GetChangeDetail.return_value = {
  3721. 'change_id': ('123456789'),
  3722. 'current_revision': 'sha1_of_current_revision',
  3723. }
  3724. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3725. latest_tree)
  3726. self.assertEqual(reviewers, ['horse@apple.farm'])
  3727. self.assertEqual(ccs, ['chicken@bok.farm', 'cow2@moo.farm'])
  3728. self.assertEqual(change_desc._description_lines, [
  3729. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '',
  3730. 'Change-Id: 123456789'
  3731. ])
  3732. mockRunHook.assert_called_once_with(committing=False,
  3733. may_prompt=True,
  3734. verbose=False,
  3735. parallel=False,
  3736. upstream='420parent',
  3737. description=desc,
  3738. all_files=False)
  3739. mockEnsureCanUploadPatchset.assert_called_once()
  3740. # Test preserve_tryjob
  3741. options.preserve_tryjobs = True
  3742. # Test edit_description
  3743. options.edit_description = True
  3744. # Test private
  3745. options.private = True
  3746. options.no_autocc = True
  3747. reviewers, ccs, change_desc = cl._PrepareChange(options, parent,
  3748. latest_tree)
  3749. self.assertEqual(ccs, ['chicken@bok.farm', 'cow2@moo.farm'])
  3750. mockPrompt.assert_called_once()
  3751. self.assertEqual(change_desc._description_lines, [
  3752. 'AH!', 'CC=cow2@moo.farm', 'R=horse@apple.farm', '',
  3753. 'Change-Id: 123456789', 'Cq-Do-Not-Cancel-Tryjobs: true'
  3754. ])
  3755. @mock.patch('git_cl.Changelist.GetGerritHost', return_value='chromium')
  3756. @mock.patch('git_cl.Settings.GetRunPostUploadHook', return_value=True)
  3757. @mock.patch('git_cl.Changelist.SetPatchset')
  3758. @mock.patch('git_cl.Changelist.RunPostUploadHook')
  3759. @mock.patch('git_cl.gerrit_util.AddReviewers')
  3760. def testPostUploadUpdates(self, mockAddReviewers, mockRunPostHook,
  3761. mockSetPatchset, *_mocks):
  3762. cl = git_cl.Changelist(branchref='refs/heads/current-branch')
  3763. options = optparse.Values()
  3764. options.verbose = True
  3765. options.no_python2_post_upload_hooks = True
  3766. options.send_mail = False
  3767. reviewers = ['monkey@vp.circus']
  3768. ccs = ['cow@rds.corp']
  3769. change_desc = git_cl.ChangeDescription('[stonks] honk honk')
  3770. new_upload = git_cl._NewUpload(reviewers, ccs, 'pushed-commit',
  3771. 'last-uploaded-commit', 'parent-commit',
  3772. change_desc, 2)
  3773. cl.PostUploadUpdates(options, new_upload, '12345')
  3774. mockSetPatchset.assert_called_once_with(3)
  3775. self.assertEqual(
  3776. self.mockGit.config['root:branch.current-branch.gerritsquashhash'],
  3777. new_upload.commit_to_push)
  3778. self.assertEqual(
  3779. self.mockGit.config['root:branch.current-branch.last-upload-hash'],
  3780. new_upload.new_last_uploaded_commit)
  3781. mockAddReviewers.assert_called_once_with('chromium',
  3782. 'project~123456',
  3783. reviewers=reviewers,
  3784. ccs=ccs,
  3785. notify=False)
  3786. mockRunPostHook.assert_called_once_with(True, 'parent-commit',
  3787. change_desc.description)
  3788. class CMDTestCaseBase(unittest.TestCase):
  3789. _STATUSES = [
  3790. 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
  3791. 'INFRA_FAILURE', 'CANCELED',
  3792. ]
  3793. _CHANGE_DETAIL = {
  3794. 'project': 'depot_tools',
  3795. 'status': 'OPEN',
  3796. 'owner': {'email': 'owner@e.mail'},
  3797. 'current_revision': 'beeeeeef',
  3798. 'revisions': {
  3799. 'deadbeaf': {
  3800. '_number': 6,
  3801. 'kind': 'REWORK',
  3802. },
  3803. 'beeeeeef': {
  3804. '_number': 7,
  3805. 'kind': 'NO_CODE_CHANGE',
  3806. 'fetch': {'http': {
  3807. 'url': 'https://chromium.googlesource.com/depot_tools',
  3808. 'ref': 'refs/changes/56/123456/7'
  3809. }},
  3810. },
  3811. },
  3812. }
  3813. _DEFAULT_RESPONSE = {
  3814. 'builds': [{
  3815. 'id': str(100 + idx),
  3816. 'builder': {
  3817. 'project': 'chromium',
  3818. 'bucket': 'try',
  3819. 'builder': 'bot_' + status.lower(),
  3820. },
  3821. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  3822. 'tags': [],
  3823. 'status': status,
  3824. } for idx, status in enumerate(_STATUSES)]
  3825. }
  3826. def setUp(self):
  3827. super(CMDTestCaseBase, self).setUp()
  3828. mock.patch('git_cl.sys.stdout', StringIO()).start()
  3829. mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
  3830. mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
  3831. mock.patch(
  3832. 'git_cl.Changelist.GetCodereviewServer',
  3833. return_value='https://chromium-review.googlesource.com').start()
  3834. mock.patch(
  3835. 'git_cl.Changelist.GetGerritHost',
  3836. return_value='chromium-review.googlesource.com').start()
  3837. mock.patch(
  3838. 'git_cl.Changelist.GetMostRecentPatchset',
  3839. return_value=7).start()
  3840. mock.patch(
  3841. 'git_cl.Changelist.GetMostRecentDryRunPatchset',
  3842. return_value=6).start()
  3843. mock.patch(
  3844. 'git_cl.Changelist.GetRemoteUrl',
  3845. return_value='https://chromium.googlesource.com/depot_tools').start()
  3846. mock.patch(
  3847. 'auth.Authenticator',
  3848. return_value=AuthenticatorMock()).start()
  3849. mock.patch(
  3850. 'gerrit_util.GetChangeDetail',
  3851. return_value=self._CHANGE_DETAIL).start()
  3852. mock.patch(
  3853. 'git_cl._call_buildbucket',
  3854. return_value = self._DEFAULT_RESPONSE).start()
  3855. mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
  3856. self.addCleanup(mock.patch.stopall)
  3857. class CMDPresubmitTestCase(CMDTestCaseBase):
  3858. def setUp(self):
  3859. super(CMDPresubmitTestCase, self).setUp()
  3860. mock.patch(
  3861. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  3862. return_value='upstream').start()
  3863. mock.patch(
  3864. 'git_cl.Changelist.FetchDescription',
  3865. return_value='fetch description').start()
  3866. mock.patch(
  3867. 'git_cl._create_description_from_log',
  3868. return_value='get description').start()
  3869. mock.patch('git_cl.Changelist.RunHook').start()
  3870. def testDefaultCase(self):
  3871. self.assertEqual(0, git_cl.main(['presubmit']))
  3872. git_cl.Changelist.RunHook.assert_called_once_with(
  3873. committing=True,
  3874. may_prompt=False,
  3875. verbose=0,
  3876. parallel=None,
  3877. upstream='upstream',
  3878. description='fetch description',
  3879. all_files=None,
  3880. files=None,
  3881. resultdb=None,
  3882. realm=None)
  3883. def testNoIssue(self):
  3884. git_cl.Changelist.GetIssue.return_value = None
  3885. self.assertEqual(0, git_cl.main(['presubmit']))
  3886. git_cl.Changelist.RunHook.assert_called_once_with(
  3887. committing=True,
  3888. may_prompt=False,
  3889. verbose=0,
  3890. parallel=None,
  3891. upstream='upstream',
  3892. description='get description',
  3893. all_files=None,
  3894. files=None,
  3895. resultdb=None,
  3896. realm=None)
  3897. def testCustomBranch(self):
  3898. self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
  3899. git_cl.Changelist.RunHook.assert_called_once_with(
  3900. committing=True,
  3901. may_prompt=False,
  3902. verbose=0,
  3903. parallel=None,
  3904. upstream='custom_branch',
  3905. description='fetch description',
  3906. all_files=None,
  3907. files=None,
  3908. resultdb=None,
  3909. realm=None)
  3910. def testOptions(self):
  3911. self.assertEqual(
  3912. 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u',
  3913. '--resultdb', '--realm', 'chromium:public']))
  3914. git_cl.Changelist.RunHook.assert_called_once_with(
  3915. committing=False,
  3916. may_prompt=False,
  3917. verbose=2,
  3918. parallel=True,
  3919. upstream='upstream',
  3920. description='fetch description',
  3921. all_files=True,
  3922. files=None,
  3923. resultdb=True,
  3924. realm='chromium:public')
  3925. class CMDTryResultsTestCase(CMDTestCaseBase):
  3926. _DEFAULT_REQUEST = {
  3927. 'predicate': {
  3928. "gerritChanges": [{
  3929. "project": "depot_tools",
  3930. "host": "chromium-review.googlesource.com",
  3931. "patchset": 6,
  3932. "change": 123456,
  3933. }],
  3934. },
  3935. 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
  3936. ',builds.*.createTime,builds.*.tags'),
  3937. }
  3938. _TRIVIAL_REQUEST = {
  3939. 'predicate': {
  3940. "gerritChanges": [{
  3941. "project": "depot_tools",
  3942. "host": "chromium-review.googlesource.com",
  3943. "patchset": 7,
  3944. "change": 123456,
  3945. }],
  3946. },
  3947. 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
  3948. ',builds.*.createTime,builds.*.tags'),
  3949. }
  3950. def testNoJobs(self):
  3951. git_cl._call_buildbucket.return_value = {}
  3952. self.assertEqual(0, git_cl.main(['try-results']))
  3953. self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
  3954. git_cl._call_buildbucket.assert_called_once_with(
  3955. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3956. self._DEFAULT_REQUEST)
  3957. def testTrivialCommits(self):
  3958. self.assertEqual(0, git_cl.main(['try-results']))
  3959. git_cl._call_buildbucket.assert_called_with(
  3960. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3961. self._DEFAULT_REQUEST)
  3962. git_cl._call_buildbucket.return_value = {}
  3963. self.assertEqual(0, git_cl.main(['try-results', '--patchset', '7']))
  3964. git_cl._call_buildbucket.assert_called_with(
  3965. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  3966. self._TRIVIAL_REQUEST)
  3967. self.assertEqual([
  3968. 'Successes:',
  3969. ' bot_success https://ci.chromium.org/b/103',
  3970. 'Infra Failures:',
  3971. ' bot_infra_failure https://ci.chromium.org/b/105',
  3972. 'Failures:',
  3973. ' bot_failure https://ci.chromium.org/b/104',
  3974. 'Canceled:',
  3975. ' bot_canceled ',
  3976. 'Started:',
  3977. ' bot_started https://ci.chromium.org/b/102',
  3978. 'Scheduled:',
  3979. ' bot_scheduled id=101',
  3980. 'Other:',
  3981. ' bot_status_unspecified id=100',
  3982. 'Total: 7 tryjobs',
  3983. 'No tryjobs scheduled.',
  3984. ], sys.stdout.getvalue().splitlines())
  3985. def testPrintToStdout(self):
  3986. self.assertEqual(0, git_cl.main(['try-results']))
  3987. self.assertEqual([
  3988. 'Successes:',
  3989. ' bot_success https://ci.chromium.org/b/103',
  3990. 'Infra Failures:',
  3991. ' bot_infra_failure https://ci.chromium.org/b/105',
  3992. 'Failures:',
  3993. ' bot_failure https://ci.chromium.org/b/104',
  3994. 'Canceled:',
  3995. ' bot_canceled ',
  3996. 'Started:',
  3997. ' bot_started https://ci.chromium.org/b/102',
  3998. 'Scheduled:',
  3999. ' bot_scheduled id=101',
  4000. 'Other:',
  4001. ' bot_status_unspecified id=100',
  4002. 'Total: 7 tryjobs',
  4003. ], sys.stdout.getvalue().splitlines())
  4004. git_cl._call_buildbucket.assert_called_once_with(
  4005. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  4006. self._DEFAULT_REQUEST)
  4007. def testPrintToStdoutWithMasters(self):
  4008. self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
  4009. self.assertEqual([
  4010. 'Successes:',
  4011. ' try bot_success https://ci.chromium.org/b/103',
  4012. 'Infra Failures:',
  4013. ' try bot_infra_failure https://ci.chromium.org/b/105',
  4014. 'Failures:',
  4015. ' try bot_failure https://ci.chromium.org/b/104',
  4016. 'Canceled:',
  4017. ' try bot_canceled ',
  4018. 'Started:',
  4019. ' try bot_started https://ci.chromium.org/b/102',
  4020. 'Scheduled:',
  4021. ' try bot_scheduled id=101',
  4022. 'Other:',
  4023. ' try bot_status_unspecified id=100',
  4024. 'Total: 7 tryjobs',
  4025. ], sys.stdout.getvalue().splitlines())
  4026. git_cl._call_buildbucket.assert_called_once_with(
  4027. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  4028. self._DEFAULT_REQUEST)
  4029. @mock.patch('git_cl.write_json')
  4030. def testWriteToJson(self, mockJsonDump):
  4031. self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
  4032. git_cl._call_buildbucket.assert_called_once_with(
  4033. mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
  4034. self._DEFAULT_REQUEST)
  4035. mockJsonDump.assert_called_once_with(
  4036. 'file.json', self._DEFAULT_RESPONSE['builds'])
  4037. def test_filter_failed_for_one_simple(self):
  4038. self.assertEqual([], git_cl._filter_failed_for_retry([]))
  4039. self.assertEqual(
  4040. [
  4041. ('chromium', 'try', 'bot_failure'),
  4042. ('chromium', 'try', 'bot_infra_failure'),
  4043. ],
  4044. git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
  4045. def test_filter_failed_for_retry_many_builds(self):
  4046. def _build(name, created_sec, status, experimental=False):
  4047. assert 0 <= created_sec < 100, created_sec
  4048. b = {
  4049. 'id': 112112,
  4050. 'builder': {
  4051. 'project': 'chromium',
  4052. 'bucket': 'try',
  4053. 'builder': name,
  4054. },
  4055. 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
  4056. 'status': status,
  4057. 'tags': [],
  4058. }
  4059. if experimental:
  4060. b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
  4061. return b
  4062. builds = [
  4063. _build('flaky-last-green', 1, 'FAILURE'),
  4064. _build('flaky-last-green', 2, 'SUCCESS'),
  4065. _build('flaky', 1, 'SUCCESS'),
  4066. _build('flaky', 2, 'FAILURE'),
  4067. _build('running', 1, 'FAILED'),
  4068. _build('running', 2, 'SCHEDULED'),
  4069. _build('yep-still-running', 1, 'STARTED'),
  4070. _build('yep-still-running', 2, 'FAILURE'),
  4071. _build('cq-experimental', 1, 'SUCCESS', experimental=True),
  4072. _build('cq-experimental', 2, 'FAILURE', experimental=True),
  4073. # Simulate experimental in CQ builder, which developer decided
  4074. # to retry manually which resulted in 2nd build non-experimental.
  4075. _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
  4076. _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
  4077. ]
  4078. builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
  4079. self.assertEqual(
  4080. [
  4081. ('chromium', 'try', 'flaky'),
  4082. ('chromium', 'try', 'sometimes-experimental'),
  4083. ],
  4084. git_cl._filter_failed_for_retry(builds))
  4085. class CMDTryTestCase(CMDTestCaseBase):
  4086. @mock.patch('git_cl.Changelist.SetCQState')
  4087. def testSetCQDryRunByDefault(self, mockSetCQState):
  4088. mockSetCQState.return_value = 0
  4089. self.assertEqual(0, git_cl.main(['try']))
  4090. git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
  4091. self.assertEqual(
  4092. sys.stdout.getvalue(),
  4093. 'Scheduling CQ dry run on: '
  4094. 'https://chromium-review.googlesource.com/123456\n')
  4095. @mock.patch('git_cl._call_buildbucket')
  4096. def testScheduleOnBuildbucket(self, mockCallBuildbucket):
  4097. mockCallBuildbucket.return_value = {}
  4098. self.assertEqual(0, git_cl.main([
  4099. 'try', '-B', 'luci.chromium.try', '-b', 'win',
  4100. '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
  4101. self.assertIn(
  4102. 'Scheduling jobs on:\n'
  4103. ' chromium/try: win',
  4104. git_cl.sys.stdout.getvalue())
  4105. expected_request = {
  4106. "requests": [{
  4107. "scheduleBuild": {
  4108. "requestId": "uuid4",
  4109. "builder": {
  4110. "project": "chromium",
  4111. "builder": "win",
  4112. "bucket": "try",
  4113. },
  4114. "gerritChanges": [{
  4115. "project": "depot_tools",
  4116. "host": "chromium-review.googlesource.com",
  4117. "patchset": 7,
  4118. "change": 123456,
  4119. }],
  4120. "properties": {
  4121. "category": "git_cl_try",
  4122. "json": [{"a": 1}, None],
  4123. "key": "val",
  4124. },
  4125. "tags": [
  4126. {"value": "win", "key": "builder"},
  4127. {"value": "git_cl_try", "key": "user_agent"},
  4128. ],
  4129. },
  4130. }],
  4131. }
  4132. mockCallBuildbucket.assert_called_with(
  4133. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4134. @mock.patch('git_cl._call_buildbucket')
  4135. def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
  4136. mockCallBuildbucket.return_value = {}
  4137. mock.patch('git_cl.Changelist.GetRemoteBranch',
  4138. return_value=('origin', 'refs/remotes/origin/main')).start()
  4139. self.assertEqual(0, git_cl.main([
  4140. 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
  4141. '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
  4142. '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
  4143. self.assertIn(
  4144. 'Scheduling jobs on:\n'
  4145. ' chromium/try: linux\n'
  4146. ' chromium/try: win',
  4147. git_cl.sys.stdout.getvalue())
  4148. expected_request = {
  4149. "requests": [{
  4150. "scheduleBuild": {
  4151. "requestId":
  4152. "uuid4",
  4153. "builder": {
  4154. "project": "chromium",
  4155. "builder": "linux",
  4156. "bucket": "try",
  4157. },
  4158. "gerritChanges": [{
  4159. "project": "depot_tools",
  4160. "host": "chromium-review.googlesource.com",
  4161. "patchset": 7,
  4162. "change": 123456,
  4163. }],
  4164. "properties": {
  4165. "category": "git_cl_try",
  4166. "json": [{
  4167. "a": 1
  4168. }, None],
  4169. "key": "val",
  4170. },
  4171. "tags": [
  4172. {
  4173. "value": "linux",
  4174. "key": "builder"
  4175. },
  4176. {
  4177. "value": "git_cl_try",
  4178. "key": "user_agent"
  4179. },
  4180. ],
  4181. "gitilesCommit": {
  4182. "host": "chromium.googlesource.com",
  4183. "project": "depot_tools",
  4184. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  4185. "ref": "refs/heads/main",
  4186. }
  4187. },
  4188. }, {
  4189. "scheduleBuild": {
  4190. "requestId":
  4191. "uuid4",
  4192. "builder": {
  4193. "project": "chromium",
  4194. "builder": "win",
  4195. "bucket": "try",
  4196. },
  4197. "gerritChanges": [{
  4198. "project": "depot_tools",
  4199. "host": "chromium-review.googlesource.com",
  4200. "patchset": 7,
  4201. "change": 123456,
  4202. }],
  4203. "properties": {
  4204. "category": "git_cl_try",
  4205. "json": [{
  4206. "a": 1
  4207. }, None],
  4208. "key": "val",
  4209. },
  4210. "tags": [
  4211. {
  4212. "value": "win",
  4213. "key": "builder"
  4214. },
  4215. {
  4216. "value": "git_cl_try",
  4217. "key": "user_agent"
  4218. },
  4219. ],
  4220. "gitilesCommit": {
  4221. "host": "chromium.googlesource.com",
  4222. "project": "depot_tools",
  4223. "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
  4224. "ref": "refs/heads/main",
  4225. }
  4226. },
  4227. }],
  4228. }
  4229. mockCallBuildbucket.assert_called_with(
  4230. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4231. @mock.patch('sys.stderr', StringIO())
  4232. def testScheduleOnBuildbucket_WrongBucket(self):
  4233. with self.assertRaises(SystemExit):
  4234. git_cl.main([
  4235. 'try', '-B', 'not-a-bucket', '-b', 'win',
  4236. '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
  4237. self.assertIn(
  4238. 'Invalid bucket: not-a-bucket.',
  4239. sys.stderr.getvalue())
  4240. @mock.patch('git_cl._call_buildbucket')
  4241. @mock.patch('git_cl._fetch_tryjobs')
  4242. def testScheduleOnBuildbucketRetryFailed(
  4243. self, mockFetchTryJobs, mockCallBuildbucket):
  4244. git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
  4245. 7: [],
  4246. 6: [{
  4247. 'id': 112112,
  4248. 'builder': {
  4249. 'project': 'chromium',
  4250. 'bucket': 'try',
  4251. 'builder': 'linux', },
  4252. 'createTime': '2019-10-09T08:00:01.854286Z',
  4253. 'tags': [],
  4254. 'status': 'FAILURE', }], }[kw['patchset']]
  4255. mockCallBuildbucket.return_value = {}
  4256. self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
  4257. self.assertIn(
  4258. 'Scheduling jobs on:\n'
  4259. ' chromium/try: linux',
  4260. git_cl.sys.stdout.getvalue())
  4261. expected_request = {
  4262. "requests": [{
  4263. "scheduleBuild": {
  4264. "requestId": "uuid4",
  4265. "builder": {
  4266. "project": "chromium",
  4267. "bucket": "try",
  4268. "builder": "linux",
  4269. },
  4270. "gerritChanges": [{
  4271. "project": "depot_tools",
  4272. "host": "chromium-review.googlesource.com",
  4273. "patchset": 7,
  4274. "change": 123456,
  4275. }],
  4276. "properties": {
  4277. "category": "git_cl_try",
  4278. },
  4279. "tags": [
  4280. {"value": "linux", "key": "builder"},
  4281. {"value": "git_cl_try", "key": "user_agent"},
  4282. {"value": "1", "key": "retry_failed"},
  4283. ],
  4284. },
  4285. }],
  4286. }
  4287. mockCallBuildbucket.assert_called_with(
  4288. mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
  4289. def test_parse_bucket(self):
  4290. test_cases = [
  4291. {
  4292. 'bucket': 'chromium/try',
  4293. 'result': ('chromium', 'try'),
  4294. },
  4295. {
  4296. 'bucket': 'luci.chromium.try',
  4297. 'result': ('chromium', 'try'),
  4298. 'has_warning': True,
  4299. },
  4300. {
  4301. 'bucket': 'skia.primary',
  4302. 'result': ('skia', 'skia.primary'),
  4303. 'has_warning': True,
  4304. },
  4305. {
  4306. 'bucket': 'not-a-bucket',
  4307. 'result': (None, None),
  4308. },
  4309. ]
  4310. for test_case in test_cases:
  4311. git_cl.sys.stdout.truncate(0)
  4312. self.assertEqual(
  4313. test_case['result'], git_cl._parse_bucket(test_case['bucket']))
  4314. if test_case.get('has_warning'):
  4315. expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
  4316. test_case['result'])
  4317. self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
  4318. class CMDUploadTestCase(CMDTestCaseBase):
  4319. def setUp(self):
  4320. super(CMDUploadTestCase, self).setUp()
  4321. mock.patch('git_cl._fetch_tryjobs').start()
  4322. mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
  4323. mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
  4324. mock.patch('git_cl.Settings.GetRoot', return_value='').start()
  4325. mock.patch(
  4326. 'git_cl.Settings.GetSquashGerritUploads',
  4327. return_value=True).start()
  4328. mock.patch.dict(os.environ, {
  4329. git_cl.DOGFOOD_STACKED_CHANGES_VAR: "0"
  4330. }).start()
  4331. self.addCleanup(mock.patch.stopall)
  4332. def testWarmUpChangeDetailCache(self):
  4333. self.assertEqual(0, git_cl.main(['upload']))
  4334. gerrit_util.GetChangeDetail.assert_called_once_with(
  4335. 'chromium-review.googlesource.com', 'depot_tools~123456',
  4336. frozenset([
  4337. 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
  4338. 'CURRENT_COMMIT']))
  4339. def testUploadRetryFailed(self):
  4340. # This test mocks out the actual upload part, and just asserts that after
  4341. # upload, if --retry-failed is added, then the tool will fetch try jobs
  4342. # from the previous patchset and trigger the right builders on the latest
  4343. # patchset.
  4344. git_cl._fetch_tryjobs.side_effect = [
  4345. # Latest patchset: No builds.
  4346. [],
  4347. # Patchset before latest: Some builds.
  4348. [{
  4349. 'id': str(100 + idx),
  4350. 'builder': {
  4351. 'project': 'chromium',
  4352. 'bucket': 'try',
  4353. 'builder': 'bot_' + status.lower(),
  4354. },
  4355. 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
  4356. 'tags': [],
  4357. 'status': status,
  4358. } for idx, status in enumerate(self._STATUSES)],
  4359. ]
  4360. self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
  4361. self.assertEqual([
  4362. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
  4363. mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
  4364. ], git_cl._fetch_tryjobs.mock_calls)
  4365. expected_buckets = [
  4366. ('chromium', 'try', 'bot_failure'),
  4367. ('chromium', 'try', 'bot_infra_failure'),
  4368. ]
  4369. git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
  4370. mock.ANY, 8)
  4371. class MakeRequestsHelperTestCase(unittest.TestCase):
  4372. def exampleGerritChange(self):
  4373. return {
  4374. 'host': 'chromium-review.googlesource.com',
  4375. 'project': 'depot_tools',
  4376. 'change': 1,
  4377. 'patchset': 2,
  4378. }
  4379. def testMakeRequestsHelperNoOptions(self):
  4380. # Basic test for the helper function _make_tryjob_schedule_requests;
  4381. # it shouldn't throw AttributeError even when options doesn't have any
  4382. # of the expected values; it will use default option values.
  4383. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4384. jobs = [('chromium', 'try', 'my-builder')]
  4385. options = optparse.Values()
  4386. requests = git_cl._make_tryjob_schedule_requests(
  4387. changelist, jobs, options, patchset=None)
  4388. # requestId is non-deterministic. Just assert that it's there and has
  4389. # a particular length.
  4390. self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
  4391. self.assertEqual(requests, [{
  4392. 'scheduleBuild': {
  4393. 'builder': {
  4394. 'bucket': 'try',
  4395. 'builder': 'my-builder',
  4396. 'project': 'chromium'
  4397. },
  4398. 'gerritChanges': [self.exampleGerritChange()],
  4399. 'properties': {
  4400. 'category': 'git_cl_try'
  4401. },
  4402. 'tags': [{
  4403. 'key': 'builder',
  4404. 'value': 'my-builder'
  4405. }, {
  4406. 'key': 'user_agent',
  4407. 'value': 'git_cl_try'
  4408. }]
  4409. }
  4410. }])
  4411. def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
  4412. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4413. jobs = [('chromium', 'try', 'presubmit')]
  4414. options = optparse.Values()
  4415. requests = git_cl._make_tryjob_schedule_requests(
  4416. changelist, jobs, options, patchset=None)
  4417. self.assertEqual(requests[0]['scheduleBuild']['properties'], {
  4418. 'category': 'git_cl_try',
  4419. 'dry_run': 'true'
  4420. })
  4421. def testMakeRequestsHelperRevisionSet(self):
  4422. # Gitiles commit is specified when revision is in options.
  4423. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4424. jobs = [('chromium', 'try', 'my-builder')]
  4425. options = optparse.Values({'revision': 'ba5eba11'})
  4426. requests = git_cl._make_tryjob_schedule_requests(
  4427. changelist, jobs, options, patchset=None)
  4428. self.assertEqual(
  4429. requests[0]['scheduleBuild']['gitilesCommit'], {
  4430. 'host': 'chromium.googlesource.com',
  4431. 'id': 'ba5eba11',
  4432. 'project': 'depot_tools',
  4433. 'ref': 'refs/heads/main',
  4434. })
  4435. def testMakeRequestsHelperRetryFailedSet(self):
  4436. # An extra tag is added when retry_failed is in options.
  4437. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4438. jobs = [('chromium', 'try', 'my-builder')]
  4439. options = optparse.Values({'retry_failed': 'true'})
  4440. requests = git_cl._make_tryjob_schedule_requests(
  4441. changelist, jobs, options, patchset=None)
  4442. self.assertEqual(
  4443. requests[0]['scheduleBuild']['tags'], [
  4444. {
  4445. 'key': 'builder',
  4446. 'value': 'my-builder'
  4447. },
  4448. {
  4449. 'key': 'user_agent',
  4450. 'value': 'git_cl_try'
  4451. },
  4452. {
  4453. 'key': 'retry_failed',
  4454. 'value': '1'
  4455. }
  4456. ])
  4457. def testMakeRequestsHelperCategorySet(self):
  4458. # The category property can be overridden with options.
  4459. changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
  4460. jobs = [('chromium', 'try', 'my-builder')]
  4461. options = optparse.Values({'category': 'my-special-category'})
  4462. requests = git_cl._make_tryjob_schedule_requests(
  4463. changelist, jobs, options, patchset=None)
  4464. self.assertEqual(requests[0]['scheduleBuild']['properties'],
  4465. {'category': 'my-special-category'})
  4466. class CMDFormatTestCase(unittest.TestCase):
  4467. def setUp(self):
  4468. super(CMDFormatTestCase, self).setUp()
  4469. mock.patch('git_cl.RunCommand').start()
  4470. mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
  4471. mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
  4472. mock.patch('git_cl.settings').start()
  4473. self._top_dir = tempfile.mkdtemp()
  4474. self.addCleanup(mock.patch.stopall)
  4475. def tearDown(self):
  4476. shutil.rmtree(self._top_dir)
  4477. super(CMDFormatTestCase, self).tearDown()
  4478. def _make_temp_file(self, fname, contents):
  4479. gclient_utils.FileWrite(os.path.join(self._top_dir, fname),
  4480. ('\n'.join(contents)))
  4481. def _make_yapfignore(self, contents):
  4482. self._make_temp_file('.yapfignore', contents)
  4483. def _check_yapf_filtering(self, files, expected):
  4484. self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
  4485. files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
  4486. def _run_command_mock(self, return_value):
  4487. def f(*args, **kwargs):
  4488. if 'stdin' in kwargs:
  4489. self.assertIsInstance(kwargs['stdin'], bytes)
  4490. return return_value
  4491. return f
  4492. def testClangFormatDiffFull(self):
  4493. self._make_temp_file('test.cc', ['// test'])
  4494. git_cl.settings.GetFormatFullByDefault.return_value = False
  4495. diff_file = [os.path.join(self._top_dir, 'test.cc')]
  4496. mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
  4497. # Diff
  4498. git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
  4499. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  4500. self._top_dir, 'HEAD')
  4501. self.assertEqual(2, return_value)
  4502. # No diff
  4503. git_cl.RunCommand.side_effect = self._run_command_mock('// test')
  4504. return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
  4505. self._top_dir, 'HEAD')
  4506. self.assertEqual(0, return_value)
  4507. def testClangFormatDiff(self):
  4508. git_cl.settings.GetFormatFullByDefault.return_value = False
  4509. # A valid file is required, so use this test.
  4510. clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
  4511. mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
  4512. # Diff
  4513. git_cl.RunCommand.side_effect = self._run_command_mock('error')
  4514. return_value = git_cl._RunClangFormatDiff(
  4515. mock_opts, ['.'], self._top_dir, 'HEAD')
  4516. self.assertEqual(2, return_value)
  4517. # No diff
  4518. git_cl.RunCommand.side_effect = self._run_command_mock('')
  4519. return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
  4520. 'HEAD')
  4521. self.assertEqual(0, return_value)
  4522. def testYapfignoreExplicit(self):
  4523. self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
  4524. files = [
  4525. 'bar.py',
  4526. 'foo/bar.py',
  4527. 'foo/baz.py',
  4528. 'foo/bar/baz.py',
  4529. 'foo/bar/foobar.py',
  4530. ]
  4531. expected = [
  4532. 'bar.py',
  4533. 'foo/baz.py',
  4534. 'foo/bar/foobar.py',
  4535. ]
  4536. self._check_yapf_filtering(files, expected)
  4537. def testYapfignoreSingleWildcards(self):
  4538. self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
  4539. files = [
  4540. 'bar.py', # Matched by *bar.py.
  4541. 'bar.txt',
  4542. 'foobar.py', # Matched by *bar.py, foo*.
  4543. 'foobar.txt', # Matched by foo*.
  4544. 'bazbar.py', # Matched by *bar.py, baz*.py.
  4545. 'bazbar.txt',
  4546. 'foo/baz.txt', # Matched by foo*.
  4547. 'bar/bar.py', # Matched by *bar.py.
  4548. 'baz/foo.py', # Matched by baz*.py, foo*.
  4549. 'baz/foo.txt',
  4550. ]
  4551. expected = [
  4552. 'bar.txt',
  4553. 'bazbar.txt',
  4554. 'baz/foo.txt',
  4555. ]
  4556. self._check_yapf_filtering(files, expected)
  4557. def testYapfignoreMultiplewildcards(self):
  4558. self._make_yapfignore(['*bar*', '*foo*baz.txt'])
  4559. files = [
  4560. 'bar.py', # Matched by *bar*.
  4561. 'bar.txt', # Matched by *bar*.
  4562. 'abar.py', # Matched by *bar*.
  4563. 'foobaz.txt', # Matched by *foo*baz.txt.
  4564. 'foobaz.py',
  4565. 'afoobaz.txt', # Matched by *foo*baz.txt.
  4566. ]
  4567. expected = [
  4568. 'foobaz.py',
  4569. ]
  4570. self._check_yapf_filtering(files, expected)
  4571. def testYapfignoreComments(self):
  4572. self._make_yapfignore(['test.py', '#test2.py'])
  4573. files = [
  4574. 'test.py',
  4575. 'test2.py',
  4576. ]
  4577. expected = [
  4578. 'test2.py',
  4579. ]
  4580. self._check_yapf_filtering(files, expected)
  4581. def testYapfHandleUtf8(self):
  4582. self._make_yapfignore(['test.py', 'test_🌐.py'])
  4583. files = [
  4584. 'test.py',
  4585. 'test_🌐.py',
  4586. 'test2.py',
  4587. ]
  4588. expected = [
  4589. 'test2.py',
  4590. ]
  4591. self._check_yapf_filtering(files, expected)
  4592. def testYapfignoreBlankLines(self):
  4593. self._make_yapfignore(['test.py', '', '', 'test2.py'])
  4594. files = [
  4595. 'test.py',
  4596. 'test2.py',
  4597. 'test3.py',
  4598. ]
  4599. expected = [
  4600. 'test3.py',
  4601. ]
  4602. self._check_yapf_filtering(files, expected)
  4603. def testYapfignoreWhitespace(self):
  4604. self._make_yapfignore([' test.py '])
  4605. files = [
  4606. 'test.py',
  4607. 'test2.py',
  4608. ]
  4609. expected = [
  4610. 'test2.py',
  4611. ]
  4612. self._check_yapf_filtering(files, expected)
  4613. def testYapfignoreNoFiles(self):
  4614. self._make_yapfignore(['test.py'])
  4615. self._check_yapf_filtering([], [])
  4616. def testYapfignoreMissingYapfignore(self):
  4617. files = [
  4618. 'test.py',
  4619. ]
  4620. expected = [
  4621. 'test.py',
  4622. ]
  4623. self._check_yapf_filtering(files, expected)
  4624. class CMDStatusTestCase(CMDTestCaseBase):
  4625. # Return branch names a,..,f with comitterdates in increasing order, i.e.
  4626. # 'f' is the most-recently changed branch.
  4627. def _mock_run_git(commands):
  4628. if commands == [
  4629. 'for-each-ref', '--format=%(refname) %(committerdate:unix)',
  4630. 'refs/heads'
  4631. ]:
  4632. branches_and_committerdates = [
  4633. 'refs/heads/a 1',
  4634. 'refs/heads/b 2',
  4635. 'refs/heads/c 3',
  4636. 'refs/heads/d 4',
  4637. 'refs/heads/e 5',
  4638. 'refs/heads/f 6',
  4639. ]
  4640. return '\n'.join(branches_and_committerdates)
  4641. # Mock the status in such a way that the issue number gives us an
  4642. # indication of the commit date (simplifies manual debugging).
  4643. def _mock_get_cl_statuses(branches, fine_grained, max_processes):
  4644. for c in branches:
  4645. c.issue = (100 + int(c.GetCommitDate()))
  4646. yield (c, 'open')
  4647. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4648. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4649. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4650. @mock.patch('git_cl.RunGit', _mock_run_git)
  4651. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4652. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4653. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=False)
  4654. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4655. def testStatus(self, *_mocks):
  4656. self.assertEqual(0, git_cl.main(['status', '--no-branch-color']))
  4657. self.maxDiff = None
  4658. self.assertEqual(
  4659. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4660. ' * a : https://crrev.com/c/101 (open)\n'
  4661. ' b : https://crrev.com/c/102 (open)\n'
  4662. ' c : https://crrev.com/c/103 (open)\n'
  4663. ' d : https://crrev.com/c/104 (open)\n'
  4664. ' e : https://crrev.com/c/105 (open)\n'
  4665. ' f : https://crrev.com/c/106 (open)\n\n'
  4666. 'Current branch: a\n'
  4667. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4668. 'Issue description:\n'
  4669. 'x\n')
  4670. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4671. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4672. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4673. @mock.patch('git_cl.RunGit', _mock_run_git)
  4674. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4675. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4676. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=False)
  4677. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4678. def testStatusByDate(self, *_mocks):
  4679. self.assertEqual(
  4680. 0, git_cl.main(['status', '--no-branch-color', '--date-order']))
  4681. self.maxDiff = None
  4682. self.assertEqual(
  4683. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4684. ' f : https://crrev.com/c/106 (open)\n'
  4685. ' e : https://crrev.com/c/105 (open)\n'
  4686. ' d : https://crrev.com/c/104 (open)\n'
  4687. ' c : https://crrev.com/c/103 (open)\n'
  4688. ' b : https://crrev.com/c/102 (open)\n'
  4689. ' * a : https://crrev.com/c/101 (open)\n\n'
  4690. 'Current branch: a\n'
  4691. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4692. 'Issue description:\n'
  4693. 'x\n')
  4694. @mock.patch('git_cl.Changelist.EnsureAuthenticated')
  4695. @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
  4696. @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
  4697. @mock.patch('git_cl.RunGit', _mock_run_git)
  4698. @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
  4699. @mock.patch('git_cl.Settings.GetRoot', return_value='')
  4700. @mock.patch('git_cl.Settings.IsStatusCommitOrderByDate', return_value=True)
  4701. @mock.patch('scm.GIT.GetBranch', return_value='a')
  4702. def testStatusByDate(self, *_mocks):
  4703. self.assertEqual(
  4704. 0, git_cl.main(['status', '--no-branch-color']))
  4705. self.maxDiff = None
  4706. self.assertEqual(
  4707. sys.stdout.getvalue(), 'Branches associated with reviews:\n'
  4708. ' f : https://crrev.com/c/106 (open)\n'
  4709. ' e : https://crrev.com/c/105 (open)\n'
  4710. ' d : https://crrev.com/c/104 (open)\n'
  4711. ' c : https://crrev.com/c/103 (open)\n'
  4712. ' b : https://crrev.com/c/102 (open)\n'
  4713. ' * a : https://crrev.com/c/101 (open)\n\n'
  4714. 'Current branch: a\n'
  4715. 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
  4716. 'Issue description:\n'
  4717. 'x\n')
  4718. class CMDOwnersTestCase(CMDTestCaseBase):
  4719. def setUp(self):
  4720. super(CMDOwnersTestCase, self).setUp()
  4721. self.owners_by_path = {
  4722. 'foo': ['a@example.com'],
  4723. 'bar': ['b@example.com', 'c@example.com'],
  4724. }
  4725. mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
  4726. mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
  4727. mock.patch(
  4728. 'git_cl.Changelist.GetAffectedFiles',
  4729. return_value=list(self.owners_by_path)).start()
  4730. mock.patch(
  4731. 'git_cl.Changelist.GetCommonAncestorWithUpstream',
  4732. return_value='upstream').start()
  4733. mock.patch(
  4734. 'git_cl.Changelist.GetGerritHost',
  4735. return_value='host').start()
  4736. mock.patch(
  4737. 'git_cl.Changelist.GetGerritProject',
  4738. return_value='project').start()
  4739. mock.patch(
  4740. 'git_cl.Changelist.GetRemoteBranch',
  4741. return_value=('origin', 'refs/remotes/origin/main')).start()
  4742. mock.patch(
  4743. 'owners_client.OwnersClient.BatchListOwners',
  4744. return_value=self.owners_by_path).start()
  4745. mock.patch(
  4746. 'gerrit_util.IsCodeOwnersEnabledOnHost', return_value=True).start()
  4747. self.addCleanup(mock.patch.stopall)
  4748. def testShowAllNoArgs(self):
  4749. self.assertEqual(0, git_cl.main(['owners', '--show-all']))
  4750. self.assertEqual(
  4751. 'No files specified for --show-all. Nothing to do.\n',
  4752. git_cl.sys.stdout.getvalue())
  4753. def testShowAll(self):
  4754. self.assertEqual(
  4755. 0,
  4756. git_cl.main(['owners', '--show-all', 'foo', 'bar', 'baz']))
  4757. owners_client.OwnersClient.BatchListOwners.assert_called_once_with(
  4758. ['foo', 'bar', 'baz'])
  4759. self.assertEqual(
  4760. '\n'.join([
  4761. 'Owners for foo:',
  4762. ' - a@example.com',
  4763. 'Owners for bar:',
  4764. ' - b@example.com',
  4765. ' - c@example.com',
  4766. 'Owners for baz:',
  4767. ' - No owners found',
  4768. '',
  4769. ]),
  4770. sys.stdout.getvalue())
  4771. def testBatch(self):
  4772. self.assertEqual(0, git_cl.main(['owners', '--batch']))
  4773. self.assertIn('a@example.com', sys.stdout.getvalue())
  4774. self.assertIn('b@example.com', sys.stdout.getvalue())
  4775. if __name__ == '__main__':
  4776. logging.basicConfig(
  4777. level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
  4778. unittest.main()