1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026202720282029203020312032203320342035203620372038203920402041204220432044204520462047204820492050205120522053205420552056205720582059206020612062206320642065206620672068206920702071207220732074207520762077207820792080208120822083208420852086208720882089209020912092209320942095209620972098209921002101210221032104210521062107210821092110211121122113211421152116211721182119212021212122212321242125212621272128212921302131213221332134213521362137213821392140214121422143214421452146214721482149215021512152215321542155215621572158215921602161216221632164216521662167216821692170217121722173217421752176217721782179218021812182218321842185218621872188218921902191219221932194219521962197219821992200220122022203220422052206220722082209221022112212221322142215221622172218221922202221222222232224222522262227222822292230223122322233223422352236223722382239224022412242224322442245224622472248224922502251225222532254225522562257225822592260226122622263226422652266226722682269227022712272227322742275227622772278227922802281228222832284228522862287228822892290229122922293229422952296229722982299230023012302230323042305230623072308230923102311231223132314231523162317231823192320232123222323232423252326232723282329233023312332233323342335233623372338233923402341234223432344234523462347234823492350235123522353235423552356235723582359236023612362236323642365236623672368236923702371237223732374237523762377237823792380238123822383238423852386238723882389239023912392239323942395239623972398239924002401240224032404240524062407240824092410241124122413241424152416241724182419242024212422242324242425242624272428242924302431243224332434243524362437243824392440244124422443244424452446244724482449245024512452245324542455245624572458245924602461246224632464246524662467246824692470247124722473247424752476247724782479248024812482248324842485248624872488248924902491249224932494249524962497249824992500250125022503250425052506250725082509251025112512251325142515251625172518251925202521252225232524252525262527252825292530253125322533253425352536253725382539254025412542254325442545254625472548254925502551255225532554255525562557255825592560256125622563256425652566256725682569257025712572257325742575257625772578257925802581258225832584258525862587258825892590259125922593259425952596259725982599260026012602260326042605260626072608260926102611261226132614261526162617261826192620262126222623262426252626262726282629263026312632263326342635263626372638263926402641264226432644264526462647264826492650265126522653265426552656265726582659266026612662266326642665266626672668266926702671267226732674267526762677267826792680268126822683268426852686268726882689269026912692269326942695269626972698269927002701270227032704270527062707270827092710271127122713271427152716271727182719272027212722272327242725272627272728272927302731273227332734273527362737273827392740274127422743274427452746274727482749275027512752275327542755275627572758275927602761276227632764276527662767276827692770277127722773277427752776277727782779278027812782278327842785278627872788278927902791279227932794279527962797279827992800280128022803280428052806280728082809281028112812281328142815281628172818281928202821282228232824282528262827282828292830283128322833283428352836283728382839284028412842284328442845284628472848284928502851285228532854285528562857285828592860286128622863286428652866286728682869287028712872287328742875287628772878287928802881288228832884288528862887288828892890289128922893289428952896289728982899290029012902290329042905290629072908290929102911291229132914291529162917291829192920292129222923292429252926292729282929293029312932293329342935293629372938293929402941294229432944294529462947294829492950295129522953295429552956295729582959296029612962296329642965296629672968296929702971297229732974297529762977297829792980298129822983298429852986298729882989299029912992299329942995299629972998299930003001300230033004300530063007300830093010301130123013301430153016301730183019302030213022302330243025302630273028302930303031303230333034303530363037303830393040304130423043304430453046304730483049305030513052305330543055305630573058305930603061306230633064306530663067306830693070307130723073307430753076307730783079308030813082308330843085308630873088308930903091309230933094309530963097309830993100310131023103310431053106310731083109311031113112311331143115311631173118311931203121312231233124312531263127312831293130313131323133313431353136313731383139314031413142314331443145314631473148314931503151315231533154315531563157315831593160316131623163316431653166316731683169317031713172317331743175317631773178317931803181318231833184318531863187318831893190319131923193319431953196319731983199320032013202320332043205320632073208320932103211321232133214321532163217321832193220322132223223322432253226322732283229323032313232323332343235323632373238323932403241324232433244324532463247324832493250325132523253325432553256325732583259326032613262326332643265326632673268326932703271327232733274327532763277327832793280328132823283328432853286328732883289329032913292329332943295329632973298329933003301330233033304330533063307330833093310331133123313331433153316331733183319332033213322332333243325332633273328332933303331333233333334333533363337333833393340334133423343334433453346334733483349335033513352335333543355335633573358335933603361336233633364336533663367336833693370337133723373337433753376337733783379338033813382338333843385338633873388338933903391339233933394339533963397339833993400340134023403340434053406340734083409341034113412341334143415341634173418341934203421342234233424342534263427342834293430343134323433343434353436343734383439344034413442344334443445344634473448344934503451345234533454345534563457345834593460346134623463346434653466346734683469347034713472347334743475347634773478347934803481348234833484348534863487348834893490349134923493349434953496349734983499350035013502350335043505350635073508350935103511351235133514351535163517351835193520352135223523352435253526352735283529353035313532353335343535353635373538353935403541354235433544354535463547354835493550355135523553355435553556355735583559356035613562356335643565356635673568356935703571357235733574357535763577357835793580358135823583358435853586358735883589359035913592359335943595359635973598359936003601360236033604360536063607360836093610361136123613361436153616361736183619362036213622362336243625362636273628362936303631363236333634363536363637363836393640364136423643364436453646364736483649365036513652365336543655365636573658365936603661366236633664366536663667366836693670367136723673367436753676367736783679368036813682368336843685368636873688368936903691369236933694369536963697369836993700370137023703370437053706370737083709371037113712371337143715371637173718371937203721372237233724372537263727372837293730373137323733373437353736373737383739374037413742374337443745374637473748374937503751375237533754375537563757375837593760376137623763376437653766376737683769377037713772377337743775377637773778377937803781378237833784378537863787378837893790379137923793379437953796379737983799380038013802380338043805380638073808380938103811381238133814381538163817381838193820382138223823382438253826382738283829383038313832383338343835383638373838383938403841384238433844384538463847384838493850385138523853385438553856385738583859386038613862386338643865386638673868386938703871387238733874387538763877387838793880388138823883388438853886388738883889389038913892389338943895389638973898389939003901390239033904390539063907390839093910391139123913391439153916391739183919392039213922392339243925392639273928392939303931393239333934393539363937393839393940394139423943394439453946394739483949395039513952395339543955395639573958395939603961396239633964396539663967396839693970397139723973397439753976397739783979398039813982398339843985398639873988398939903991399239933994399539963997399839994000400140024003400440054006400740084009401040114012401340144015401640174018401940204021402240234024402540264027402840294030403140324033403440354036403740384039404040414042404340444045404640474048404940504051405240534054405540564057405840594060406140624063406440654066406740684069407040714072407340744075407640774078407940804081408240834084408540864087408840894090409140924093 |
- # -*- coding: utf-8 -*-
- """
- (c) 2015-2018 - Copyright Red Hat Inc
- Authors:
- Pierre-Yves Chibon <pingou@pingoured.fr>
- """
- from __future__ import unicode_literals, absolute_import
- import datetime
- import os
- import shutil
- import sys
- import tempfile
- import time
- import unittest
- import pygit2
- import six
- from mock import patch, MagicMock
- sys.path.insert(
- 0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
- )
- import pagure.lib.git
- import tests
- from pagure.lib.repo import PagureRepo
- class PagureLibGittests(tests.Modeltests):
- """Tests for pagure.lib.git"""
- maxDiff = None
- def test_write_gitolite_acls(self):
- """Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is an made an admin"""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(
- self.session, configfile=outputconf, project=-1
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_preconf(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- a preconf set"""
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- preconf = os.path.join(self.path, "header_gitolite")
- with open(preconf, "w") as stream:
- stream.write("# this is a header that is manually added")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(
- self.session, outputconf, project=-1, preconf=preconf
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """# this is a header that is manually added
- # end of header
- repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data.split("\n"), exp.split("\n"))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_preconf_postconf(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- a postconf set"""
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- preconf = os.path.join(self.path, "header_gitolite")
- with open(preconf, "w") as stream:
- stream.write("# this is a header that is manually added")
- postconf = os.path.join(self.path, "footer_gitolite")
- with open(postconf, "w") as stream:
- stream.write("# end of generated configuration")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(
- self.session,
- outputconf,
- project=-1,
- preconf=preconf,
- postconf=postconf,
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """# this is a header that is manually added
- # end of header
- repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- # end of generated configuration
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_postconf(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- a preconf and a postconf set"""
- tests.create_projects(self.session)
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- postconf = os.path.join(self.path, "footer_gitolite")
- with open(postconf, "w") as stream:
- stream.write("# end of generated configuration")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(
- self.session, outputconf, project=-1, postconf=postconf
- )
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- # end of body
- # end of generated configuration
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_deploykeys(self):
- """Test write_gitolite_acls function to add deploy keys."""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add two deploy keys (one readonly one push)
- pingou = pagure.lib.query.get_user(self.session, "pingou")
- msg1 = pagure.lib.query.add_sshkey_to_project_or_user(
- session=self.session,
- project=repo,
- ssh_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==",
- pushaccess=False,
- creator=pingou,
- )
- msg2 = pagure.lib.query.add_sshkey_to_project_or_user(
- session=self.session,
- project=repo,
- ssh_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC9Xwc2RDzPBhlEDARfHldGjudIVoa04tqT1JVKGQmyllTFz7Rb8CngQL3e7zyNzotnhwYKHdoiLlPkVEiDee4dWMUe48ilqId+FJZQGhyv8fu4BoFdE1AJUVylzmltbLg14VqG5gjTpXgtlrEva9arKwBMHJjRYc8ScaSn3OgyQw==",
- pushaccess=True,
- creator=pingou,
- )
- self.session.commit()
- self.assertEqual(msg1, "SSH key added")
- self.assertEqual(msg2, "SSH key added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo docs/test
- R = @all
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo tickets/test
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo requests/test
- RW+ = pingou
- R = deploykey_test_1
- RW+ = deploykey_test_2
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_ticket(self):
- """Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is just a ticketer"""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session,
- project=repo,
- new_user="foo",
- user="pingou",
- access="ticket",
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- repo docs/test
- R = @all
- RW+ = pingou
- repo tickets/test
- RW+ = pingou
- repo requests/test
- RW+ = pingou
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_commit(self):
- """Test the write_gitolite_acls function of pagure.lib.git.
- when the new uesr is just a committer"""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session,
- project=repo,
- new_user="foo",
- user="pingou",
- access="commit",
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- groups as admin
- """
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add a couple of groups
- # They would be admins
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="sysadmin",
- display_name="sysadmin group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `sysadmin`.")
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="devs",
- display_name="devs group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `devs`.")
- # Associate these groups to a project
- msg = pagure.lib.query.add_group_to_project(
- session=self.session,
- project=repo,
- new_group="sysadmin",
- user="pingou",
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- msg = pagure.lib.query.add_group_to_project(
- session=self.session, project=repo, new_group="devs", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- # Add an user to a project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test2",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data.split("\n"), exp.split("\n"))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups_ticket(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- groups as ticketers
- """
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add a couple of groups
- # They would be ticketers
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="sysadmin",
- display_name="sysadmin group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `sysadmin`.")
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="devs",
- display_name="devs group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `devs`.")
- # Associate these groups to a project
- msg = pagure.lib.query.add_group_to_project(
- session=self.session,
- project=repo,
- new_group="sysadmin",
- user="pingou",
- access="ticket",
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- msg = pagure.lib.query.add_group_to_project(
- session=self.session,
- project=repo,
- new_group="devs",
- user="pingou",
- access="ticket",
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- # Add an user to a project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test2",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data.split("\n"), exp.split("\n"))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_acls_groups_commit(self):
- """Test the write_gitolite_acls function of pagure.lib.git with
- groups as committers
- """
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Add a couple of groups
- # They would be committers
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="sysadmin",
- display_name="sysadmin group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `sysadmin`.")
- msg = pagure.lib.query.add_group(
- self.session,
- group_name="devs",
- display_name="devs group",
- description=None,
- group_type="user",
- user="pingou",
- is_admin=False,
- blacklist=[],
- )
- self.session.commit()
- self.assertEqual(msg, "User `pingou` added to the group `devs`.")
- # Associate these groups to a project
- msg = pagure.lib.query.add_group_to_project(
- session=self.session,
- project=repo,
- new_group="sysadmin",
- user="pingou",
- access="commit",
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- msg = pagure.lib.query.add_group_to_project(
- session=self.session,
- project=repo,
- new_group="devs",
- user="pingou",
- access="commit",
- )
- self.session.commit()
- self.assertEqual(msg, "Group added")
- # Add an user to a project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test2",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """@devs = pingou
- @sysadmin = pingou
- # end of groups
- repo test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo docs/test
- R = @all
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = @devs @sysadmin
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test2
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test2
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test2
- RW+ = pingou
- repo requests/forks/pingou/test2
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data.split("\n"), exp.split("\n"))
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- def test_write_gitolite_project_pr_only(self):
- """Test the write_gitolite_acls function of pagure.lib.git.
- when the project enforces the PR approach.
- """
- tests.create_projects(self.session)
- repo = pagure.lib.query._get_project(self.session, "test")
- # Make the project enforce the PR workflow
- settings = repo.settings
- settings["pull_request_access_only"] = True
- repo.settings = settings
- self.session.add(repo)
- self.session.commit()
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo test2
- R = @all
- RW+ = pingou
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo somenamespace/test3
- R = @all
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- @patch.dict("pagure.config.config", {"PR_ONLY": True})
- def test_write_gitolite_global_pr_only(self):
- """Test the write_gitolite_acls function of pagure.lib.git.
- when the pagure instance enforces the PR approach.
- """
- tests.create_projects(self.session)
- repo = pagure.lib.query._get_project(self.session, "test")
- self.assertFalse(repo.settings["pull_request_access_only"])
- # Add an user to a project
- # The user will be an admin of the project
- msg = pagure.lib.query.add_user_to_project(
- session=self.session, project=repo, new_user="foo", user="pingou"
- )
- self.session.commit()
- self.assertEqual(msg, "User added")
- # Add a forked project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test3",
- description="test project #2",
- is_fork=True,
- parent_id=1,
- hook_token="aaabbbvvv",
- )
- self.session.add(item)
- self.session.commit()
- outputconf = os.path.join(self.path, "test_gitolite.conf")
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.write_gitolite_acls(self.session, outputconf, project=-1)
- self.assertTrue(os.path.exists(outputconf))
- with open(outputconf) as stream:
- data = stream.read()
- exp = """repo docs/test
- R = @all
- RW+ = pingou
- RW+ = foo
- repo tickets/test
- RW+ = pingou
- RW+ = foo
- repo requests/test
- RW+ = pingou
- RW+ = foo
- repo docs/test2
- R = @all
- RW+ = pingou
- repo tickets/test2
- RW+ = pingou
- repo requests/test2
- RW+ = pingou
- repo docs/somenamespace/test3
- R = @all
- RW+ = pingou
- repo tickets/somenamespace/test3
- RW+ = pingou
- repo requests/somenamespace/test3
- RW+ = pingou
- repo forks/pingou/test3
- R = @all
- RW+ = pingou
- repo docs/forks/pingou/test3
- R = @all
- RW+ = pingou
- repo tickets/forks/pingou/test3
- RW+ = pingou
- repo requests/forks/pingou/test3
- RW+ = pingou
- # end of body
- """
- # print data
- self.assertEqual(data, exp)
- os.unlink(outputconf)
- self.assertFalse(os.path.exists(outputconf))
- @patch("pagure.lib.notify.send_email")
- def test_update_git(self, email_f):
- """Test the update_git of pagure.lib.git."""
- email_f.return_value = True
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test_ticket_repo",
- description="test project for ticket",
- hook_token="aaabbbwww",
- )
- self.session.add(item)
- self.session.commit()
- # Create repo
- self.gitrepo = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- pygit2.init_repository(self.gitrepo, bare=True)
- repo = pagure.lib.query.get_authorized_project(
- self.session, "test_ticket_repo"
- )
- # Create an issue to play with
- msg = pagure.lib.query.new_issue(
- session=self.session,
- repo=repo,
- title="Test issue",
- content="We should work on this",
- user="pingou",
- )
- self.assertEqual(msg.title, "Test issue")
- issue = pagure.lib.query.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.update_git(issue, repo).get()
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single("HEAD")
- # Use patch to validate the repo
- commit_patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = r"""Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated issue <hash>: Test issue
- ---
- diff --git a/123 b/456
- new file mode 100644
- index 0000000..60f7480
- --- /dev/null
- +++ b/456
- @@ -0,0 +1,33 @@
- +{
- + "assignee": null,
- + "blocks": [],
- + "close_status": null,
- + "closed_at": null,
- + "comments": [],
- + "content": "We should work on this",
- + "custom_fields": [],
- + "date_created": null,
- + "depends": [],
- + "full_url": "http://localhost.localdomain/test_ticket_repo/issue/1",
- + "id": 1,
- + "last_updated": null,
- + "milestone": null,
- + "priority": null,
- + "private": false,
- + "related_prs": [],
- + "status": "Open",
- + "tags": [],
- + "title": "Test issue",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "full_url": "http://localhost.localdomain/user/pingou",
- + "fullname": "PY C",
- + "name": "pingou",
- + "url_path": "user/pingou"
- + }
- +}
- \ No newline at end of file
- """
- npatch = []
- for row in commit_patch.split("\n"):
- if row.startswith("Date:"):
- continue
- elif row.startswith("From "):
- row = row.split(" ", 2)[2]
- elif row.startswith("diff --git "):
- row = row.split(" ")
- row[2] = "a/123"
- row[3] = "b/456"
- row = " ".join(row)
- elif "Updated issue" in row:
- row = row.split()
- row[3] = "<hash>:"
- row = " ".join(row)
- elif "date_created" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "last_updated" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "closed_at" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "closed_by" in row:
- continue
- elif row.startswith("index 00"):
- row = "index 0000000..60f7480"
- elif row.startswith("+++ b/"):
- row = "+++ b/456"
- npatch.append(row)
- commit_patch = "\n".join(npatch)
- # print commit_patch
- self.assertEqual(commit_patch, exp)
- # Enforce having a different last_updated field
- # This is required as the test run fine and fast with sqlite but is
- # much slower with postgresql so we end-up with an updated
- # last_updated in postgresql but not with sqlite
- time.sleep(1)
- # Test again after adding a comment
- # We need to make sure we wait for worker to commit the comment
- with patch("pagure.lib.git._maybe_wait", tests.definitely_wait):
- msg = pagure.lib.query.add_issue_comment(
- session=self.session,
- issue=issue,
- comment="Hey look a comment!",
- user="foo",
- )
- self.session.commit()
- self.assertEqual(msg, "Comment added")
- # Use patch to validate the repo
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single("HEAD")
- commit_patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = r"""Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated issue <hash>: Test issue
- ---
- diff --git a/123 b/456
- index 458821a..77674a8
- --- a/123
- +++ b/456
- @@ -4,14 +4,35 @@
- "close_status": null,
- "closed_at": null,
- - "comments": [],
- + "comments": [
- + {
- + "comment": "Hey look a comment!",
- + "date_created": null,
- + "edited_on": null,
- + "editor": null,
- + "id": 1,
- + "notification": false,
- + "parent": null,
- + "reactions": {},
- + "user": {
- + "default_email": "foo@bar.com",
- + "emails": [
- + "foo@bar.com"
- + ],
- + "full_url": "http://localhost.localdomain/user/foo",
- + "fullname": "foo bar",
- + "name": "foo",
- + "url_path": "user/foo"
- + }
- + }
- + ],
- "content": "We should work on this",
- "custom_fields": [],
- "date_created": null,
- "depends": [],
- "full_url": "http://localhost.localdomain/test_ticket_repo/issue/1",
- "id": 1,
- - "last_updated": "<date>",
- + "last_updated": "<date>",
- "milestone": null,
- "priority": null,
- "private": false,
- """
- npatch = []
- for row in commit_patch.split("\n"):
- if row.startswith("Date:"):
- continue
- elif row.startswith("From "):
- row = row.split(" ", 2)[2]
- elif row.startswith("diff --git "):
- row = row.split(" ")
- row[2] = "a/123"
- row[3] = "b/456"
- row = " ".join(row)
- elif "Updated issue" in row:
- row = row.split()
- row[3] = "<hash>:"
- row = " ".join(row)
- elif "date_created" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "closed_at" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "closed_by" in row:
- continue
- elif row.startswith("index"):
- row = "index 458821a..77674a8"
- elif row.startswith("--- a/"):
- row = "--- a/123"
- elif row.startswith("+++ b/"):
- row = "+++ b/456"
- elif "last_updated" in row:
- t = row.split(": ")[0]
- row = '%s: "<date>",' % t
- npatch.append(row)
- commit_patch = "\n".join(npatch)
- # print commit_patch
- self.assertEqual(commit_patch, exp)
- def test_clean_git(self):
- """Test the clean_git method of pagure.lib.git."""
- self.test_update_git()
- gitpath = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- gitrepo = pygit2.init_repository(gitpath, bare=True)
- # Get the uid of the ticket created
- commit = gitrepo.revparse_single("HEAD")
- patch = pagure.lib.git.commit_to_patch(gitrepo, commit)
- hash_file = None
- for row in patch.split("\n"):
- if row.startswith("+++ b/"):
- hash_file = row.split("+++ b/")[-1]
- break
- # The only file in git is the one of that ticket
- files = [entry.name for entry in commit.tree]
- self.assertEqual(files, [hash_file])
- repo = pagure.lib.query.get_authorized_project(
- self.session, "test_ticket_repo"
- )
- issue = pagure.lib.query.search_issues(self.session, repo, issueid=1)
- pagure.lib.git.clean_git(repo, issue.repotype, issue.uid).get()
- # No more files in the git repo
- commit = gitrepo.revparse_single("HEAD")
- files = [entry.name for entry in commit.tree]
- self.assertEqual(files, [])
- @patch("pagure.lib.notify.send_email")
- def test_update_git_requests(self, email_f):
- """Test the update_git of pagure.lib.git for pull-requests."""
- email_f.return_value = True
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test_ticket_repo",
- description="test project for ticket",
- hook_token="aaabbbxxx",
- )
- self.session.add(item)
- self.session.commit()
- # Create repo
- self.gitrepo = os.path.join(
- self.path, "repos", "requests", "test_ticket_repo.git"
- )
- pygit2.init_repository(self.gitrepo, bare=True)
- # Create a PR to play with
- repo = pagure.lib.query.get_authorized_project(
- self.session, "test_ticket_repo"
- )
- # Create an issue to play with
- req = pagure.lib.query.new_pull_request(
- session=self.session,
- repo_from=repo,
- branch_from="feature",
- repo_to=repo,
- branch_to="master",
- title="test PR",
- user="pingou",
- requestuid="foobar",
- requestid=None,
- status="Open",
- notify=True,
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, "test PR")
- request = repo.requests[0]
- self.assertEqual(request.title, "test PR")
- pagure.lib.git.update_git(request, request.project).get()
- repo = pygit2.Repository(self.gitrepo)
- commit = repo.revparse_single("HEAD")
- # Use patch to validate the repo
- patch = pagure.lib.git.commit_to_patch(repo, commit)
- exp = r"""Mon Sep 17 00:00:00 2001
- From: pagure <pagure>
- Subject: Updated pull-request <hash>: test PR
- ---
- diff --git a/123 b/456
- new file mode 100644
- index 0000000..60f7480
- --- /dev/null
- +++ b/456
- @@ -0,0 +1,162 @@
- +{
- + "assignee": null,
- + "branch": "master",
- + "branch_from": "feature",
- + "cached_merge_status": "unknown",
- + "closed_at": null,
- + "closed_by": null,
- + "comments": [],
- + "commit_start": null,
- + "commit_stop": null,
- + "date_created": null,
- + "full_url": "http://localhost.localdomain/test_ticket_repo/pull-request/1",
- + "id": 1,
- + "initial_comment": null,
- + "last_updated": null,
- + "project": {
- + "access_groups": {
- + "admin": [],
- + "collaborator": [],
- + "commit": [],
- + "ticket": []
- + },
- + "access_users": {
- + "admin": [],
- + "collaborator": [],
- + "commit": [],
- + "owner": [
- + "pingou"
- + ],
- + "ticket": []
- + },
- + "boards": [],
- + "close_status": [],
- + "custom_keys": [],
- + "date_created": null,
- + "date_modified": null,
- + "description": "test project for ticket",
- + "full_url": "http://localhost.localdomain/test_ticket_repo",
- + "fullname": "test_ticket_repo",
- + "id": 1,
- + "milestones": {},
- + "name": "test_ticket_repo",
- + "namespace": null,
- + "parent": null,
- + "priorities": {},
- + "settings": {
- + "Enforce_signed-off_commits_in_pull-request": false,
- + "Minimum_score_to_merge_pull-request": -1,
- + "Only_assignee_can_merge_pull-request": false,
- + "Web-hooks": null,
- + "always_merge": false,
- + "disable_non_fast-forward_merges": false,
- + "fedmsg_notifications": true,
- + "issue_tracker": true,
- + "issue_tracker_read_only": false,
- + "issues_default_to_private": false,
- + "mqtt_notifications": true,
- + "notify_on_commit_flag": false,
- + "notify_on_pull-request_flag": false,
- + "open_metadata_access_to_all": false,
- + "project_documentation": false,
- + "pull_request_access_only": false,
- + "pull_requests": true,
- + "stomp_notifications": true
- + },
- + "tags": [],
- + "url_path": "test_ticket_repo",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "full_url": "http://localhost.localdomain/user/pingou",
- + "fullname": "PY C",
- + "name": "pingou",
- + "url_path": "user/pingou"
- + }
- + },
- + "remote_git": null,
- + "repo_from": {
- + "access_groups": {
- + "admin": [],
- + "collaborator": [],
- + "commit": [],
- + "ticket": []
- + },
- + "access_users": {
- + "admin": [],
- + "collaborator": [],
- + "commit": [],
- + "owner": [
- + "pingou"
- + ],
- + "ticket": []
- + },
- + "boards": [],
- + "close_status": [],
- + "custom_keys": [],
- + "date_created": null,
- + "date_modified": null,
- + "description": "test project for ticket",
- + "full_url": "http://localhost.localdomain/test_ticket_repo",
- + "fullname": "test_ticket_repo",
- + "id": 1,
- + "milestones": {},
- + "name": "test_ticket_repo",
- + "namespace": null,
- + "parent": null,
- + "priorities": {},
- + "settings": {
- + "Enforce_signed-off_commits_in_pull-request": false,
- + "Minimum_score_to_merge_pull-request": -1,
- + "Only_assignee_can_merge_pull-request": false,
- + "Web-hooks": null,
- + "always_merge": false,
- + "disable_non_fast-forward_merges": false,
- + "fedmsg_notifications": true,
- + "issue_tracker": true,
- + "issue_tracker_read_only": false,
- + "issues_default_to_private": false,
- + "mqtt_notifications": true,
- + "notify_on_commit_flag": false,
- + "notify_on_pull-request_flag": false,
- + "open_metadata_access_to_all": false,
- + "project_documentation": false,
- + "pull_request_access_only": false,
- + "pull_requests": true,
- + "stomp_notifications": true
- + },
- + "tags": [],
- + "url_path": "test_ticket_repo",
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "full_url": "http://localhost.localdomain/user/pingou",
- + "fullname": "PY C",
- + "name": "pingou",
- + "url_path": "user/pingou"
- + }
- + },
- + "status": "Open",
- + "tags": [],
- + "threshold_reached": null,
- + "title": "test PR",
- + "uid": "foobar",
- + "updated_on": null,
- + "user": {
- + "default_email": "bar@pingou.com",
- + "emails": [
- + "bar@pingou.com",
- + "foo@pingou.com"
- + ],
- + "full_url": "http://localhost.localdomain/user/pingou",
- + "fullname": "PY C",
- + "name": "pingou",
- + "url_path": "user/pingou"
- + }
- +}
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- elif row.startswith("From "):
- row = row.split(" ", 2)[2]
- elif row.startswith("diff --git "):
- row = row.split(" ")
- row[2] = "a/123"
- row[3] = "b/456"
- row = " ".join(row)
- elif "Updated pull-request" in row:
- row = row.split()
- row[3] = "<hash>:"
- row = " ".join(row)
- elif "date_created" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "date_modified" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "last_updated" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif "updated_on" in row:
- t = row.split(": ")[0]
- row = "%s: null," % t
- elif row.startswith("index 00"):
- row = "index 0000000..60f7480"
- elif row.startswith("+++ b/"):
- row = "+++ b/456"
- npatch.append(row)
- patch = "\n".join(npatch)
- print(patch)
- self.assertEqual(patch, exp)
- def test_update_ticket_from_git_no_priority(self):
- """Test the update_ticket_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "pingou",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- "priority": 1,
- }
- # Invalid project
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_ticket_from_git,
- self.session,
- reponame="foobar",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- # Create the issue
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "pingou",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # Edit the issue
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "pingou",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- "priority": 1,
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # Data contained a priority but not the project, so bailing
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, "foobar")
- self.assertEqual(repo.issues[0].title, "foo")
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, "Next Release")
- self.assertEqual(repo.issues[0].priority, None)
- self.assertEqual(
- repo.milestones, {"Next Release": {"active": True, "date": None}}
- )
- @patch("pagure.lib.notify.send_email", MagicMock(return_value=True))
- def test_update_ticket_from_git_close_ticket(self):
- """Test the update_ticket_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- # Create the issue
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "foo",
- "emails": ["foo@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # Edit the issue
- data = {
- "status": "Closed",
- "close_status": "Fixed",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "foo",
- "emails": ["foo@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, "foobar")
- self.assertEqual(repo.issues[0].title, "foo")
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, "Next Release")
- self.assertEqual(repo.issues[0].priority, None)
- self.assertEqual(
- repo.milestones, {"Next Release": {"active": True, "date": None}}
- )
- self.assertEqual(repo.issues[0].status, "Closed")
- self.assertEqual(repo.issues[0].close_status, "Fixed")
- self.assertIsNotNone(repo.issues[0].closed_at)
- self.assertEqual(
- repo.issues[0].comments[-1].comment,
- "**Metadata Update from @pingou**:\n"
- "- Issue close_status updated to: Fixed\n"
- "- Issue status updated to: Closed (was: Open)",
- )
- def test_update_ticket_from_git(self):
- """Test the update_ticket_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- # Set some priorities to the project
- repo.priorities = {"1": "High", "2": "Normal"}
- self.session.add(repo)
- self.session.commit()
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- data = {
- "status": "Open",
- "title": "foo",
- "comments": [],
- "content": "bar",
- "date_created": "1426500263",
- "user": {
- "name": "pingou",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "milestone": "Next Release",
- "priority": 1,
- }
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_ticket_from_git,
- self.session,
- reponame="foobar",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # After 1 insertion
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, "foobar")
- self.assertEqual(repo.issues[0].title, "foo")
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].milestone, "Next Release")
- self.assertEqual(repo.issues[0].priority, 1)
- self.assertIsNone(repo.issues[0].closed_at)
- self.assertEqual(
- repo.milestones, {"Next Release": {"active": True, "date": None}}
- )
- data["title"] = "fake issue for tests"
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # After edit
- self.assertEqual(len(repo.issues), 1)
- self.assertEqual(repo.issues[0].id, 1)
- self.assertEqual(repo.issues[0].uid, "foobar")
- self.assertEqual(repo.issues[0].title, "fake issue for tests")
- self.assertEqual(repo.issues[0].depending_text, [])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].priority, 1)
- self.assertIsNone(repo.issues[0].closed_at)
- data = {
- "status": "Closed",
- "close_status": "Fixed",
- "closed_at": "1426595225",
- "title": "Rename pagure",
- "full_url": "http://localhost.localdomain/test/issue/20",
- "private": False,
- "content": "This is too much of a conflict with the book",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 20,
- "blocks": [1],
- "depends": [3, 4],
- "date_created": "1426595224",
- "milestone": "Future",
- "priority": 1,
- "comments": [
- {
- "comment": "Nirik:\r\n\r\n- sourceforge++ \r\n- "
- "gitmaker\r\n- mastergit \r\n- hostomatic\r\n- "
- "gitcorp\r\n- git-keiretsu \r\n- gitbuffet\r\n- "
- "cogitator\r\n- cogitate\r\n\r\nrandomuser:\r\n\r\n- "
- "COLLABORATRON5000\r\n- git-sm\\u00f6rg\\u00e5sbord\r\n- "
- "thislittlegittywenttomarket\r\n- git-o-rama\r\n- "
- "gitsundheit",
- "date_created": "1426595224",
- "id": 250,
- "parent": None,
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- },
- {
- "comment": "Nirik:\r\n\r\n- sourceforge++ \r\n- "
- "gitmaker\r\n- mastergit \r\n- hostomatic\r\n- "
- "gitcorp\r\n- git-keiretsu \r\n- gitbuffet\r\n- "
- "cogitator\r\n- cogitate\r\n\r\nrandomuser:\r\n\r\n- "
- "COLLABORATRON5000\r\n- git-sm\\u00f6rg\\u00e5sbord\r\n- "
- "thislittlegittywenttomarket\r\n- git-o-rama\r\n- "
- "gitsundheit",
- "date_created": "1426595340",
- "id": 324,
- "parent": None,
- "user": {
- "fullname": "Ralph Bean",
- "name": "ralph",
- "default_email": "ralph@fedoraproject.org",
- "emails": ["ralph@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- },
- ],
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- issue_uid="foobar2",
- json_data=data,
- agent="pingou",
- )
- # After second insertion
- self.assertEqual(len(repo.issues), 2)
- self.assertEqual(repo.issues[0].uid, "foobar")
- self.assertEqual(repo.issues[0].title, "fake issue for tests")
- self.assertEqual(repo.issues[0].depending_text, [20])
- self.assertEqual(repo.issues[0].blocking_text, [])
- self.assertEqual(repo.issues[0].status, "Open")
- self.assertIsNone(repo.issues[0].close_status)
- self.assertIsNone(repo.issues[0].closed_at)
- # New one
- self.assertEqual(repo.issues[1].uid, "foobar2")
- self.assertEqual(repo.issues[1].title, "Rename pagure")
- self.assertEqual(repo.issues[1].depending_text, [])
- self.assertEqual(repo.issues[1].blocking_text, [1])
- self.assertEqual(repo.issues[1].milestone, "Future")
- self.assertEqual(repo.issues[1].status, "Closed")
- self.assertEqual(repo.issues[1].close_status, "Fixed")
- self.assertIsNotNone(repo.issues[1].closed_at)
- self.assertDictEqual(
- repo.milestones,
- {
- "Future": {"active": True, "date": None},
- "Next Release": {"active": True, "date": None},
- },
- )
- def test_update_request_from_git(self):
- """Test the update_request_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- tests.create_projects_git(os.path.join(self.path, "repos"))
- repo = pagure.lib.query._get_project(self.session, "test")
- namespaced_repo = pagure.lib.query._get_project(
- self.session, "test3", namespace="somenamespace"
- )
- # Before
- self.assertEqual(len(repo.requests), 0)
- self.assertEqual(repo.requests, [])
- self.assertEqual(len(namespaced_repo.requests), 0)
- self.assertEqual(namespaced_repo.requests, [])
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e56",
- "project": {
- "custom_keys": [],
- "parent": None,
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 1,
- "description": "test project",
- "full_url": "http://localhost.localdomain/test",
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 7,
- "comments": [
- {
- "comment": "really?",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "parent": None,
- "date_created": "1426843778",
- "commit": "fa72f315373ec5f98f2b08c8ffae3645c97aaad2",
- "line": 5,
- "id": 1,
- "filename": "test",
- },
- {
- "comment": "Again ?",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "parent": None,
- "date_created": "1426866781",
- "commit": "94ebaf900161394059478fd88aec30e59092a1d7",
- "line": 5,
- "id": 2,
- "filename": "test2",
- },
- {
- "comment": "Should be fine in fact",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "parent": None,
- "date_created": "1426866950",
- "commit": "94ebaf900161394059478fd88aec30e59092a1d7",
- "line": 5,
- "id": 3,
- "filename": "test2",
- },
- ],
- "branch_from": "master",
- "title": "test request",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "custom_keys": [],
- "parent": None,
- "name": "test",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- "full_url": "http://localhost.localdomain/test",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": ["fake@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/fake",
- },
- "full_url": "http://localhost.localdomain/fork/fake/test",
- "id": 6,
- "description": "test project",
- },
- "branch": "master",
- "date_created": "1426843732",
- }
- self.assertRaises(
- pagure.exceptions.PagureException,
- pagure.lib.git.update_request_from_git,
- self.session,
- reponame="foobar",
- namespace=None,
- username=None,
- request_uid="d4182a2ac2d541d884742d3037c26e56",
- json_data=data,
- )
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- request_uid="d4182a2ac2d541d884742d3037c26e56",
- json_data=data,
- )
- self.session.commit()
- # After 1 st insertion
- self.assertEqual(len(repo.requests), 1)
- self.assertEqual(repo.requests[0].id, 7)
- self.assertEqual(
- repo.requests[0].uid, "d4182a2ac2d541d884742d3037c26e56"
- )
- self.assertEqual(repo.requests[0].title, "test request")
- self.assertEqual(len(repo.requests[0].comments), 3)
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e57",
- "project": {
- "parent": None,
- "name": "test",
- "custom_keys": [],
- "date_created": "1426500194",
- "full_url": "http://localhost.localdomain/test",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 4,
- "comments": [],
- "branch_from": "master",
- "title": "test request #2",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "parent": None,
- "name": "test",
- "full_url": "http://localhost.localdomain/test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": ["fake@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/fake",
- },
- "project_docs": True,
- "id": 6,
- "description": "test project",
- "full_url": "http://localhost.localdomain/fork/fake/test",
- },
- "branch": "master",
- "date_created": "1426843745",
- }
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- request_uid="d4182a2ac2d541d884742d3037c26e57",
- json_data=data,
- )
- self.session.commit()
- # After 2 nd insertion
- self.assertEqual(len(repo.requests), 2)
- self.assertEqual(repo.requests[0].id, 7)
- self.assertEqual(
- repo.requests[0].uid, "d4182a2ac2d541d884742d3037c26e56"
- )
- self.assertEqual(repo.requests[0].title, "test request")
- self.assertEqual(len(repo.requests[0].comments), 3)
- # 2 entry
- self.assertEqual(repo.requests[1].id, 4)
- self.assertEqual(
- repo.requests[1].uid, "d4182a2ac2d541d884742d3037c26e57"
- )
- self.assertEqual(repo.requests[1].title, "test request #2")
- self.assertEqual(len(repo.requests[1].comments), 0)
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e58",
- "full_url": "http://localhost.localdomain/test/pull-request/5",
- "project": {
- "parent": None,
- "name": "test3",
- "full_url": "http://localhost.localdomain/somenamespace/test3",
- "custom_keys": [],
- "namespace": "somenamespace",
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 3,
- "description": "namespaced test project",
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 5,
- "comments": [],
- "branch_from": "master",
- "title": "test request to namespaced repo",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "parent": None,
- "name": "test",
- "full_url": "http://localhost.localdomain/test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "name": "test",
- "full_url": "http://localhost.localdomain/test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": ["fake@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "project_docs": True,
- "id": 6,
- "description": "test project",
- },
- "branch": "master",
- "date_created": "1426843745",
- }
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame="test3",
- namespace="somenamespace",
- username=None,
- request_uid="d4182a2ac2d541d884742d3037c26e58",
- json_data=data,
- )
- self.session.commit()
- self.assertEqual(len(namespaced_repo.requests), 1)
- self.assertEqual(namespaced_repo.requests[0].id, 5)
- self.assertEqual(
- namespaced_repo.requests[0].uid, "d4182a2ac2d541d884742d3037c26e58"
- )
- self.assertEqual(
- namespaced_repo.requests[0].title,
- "test request to namespaced repo",
- )
- def test_update_ticket_from_git_with_boards(self):
- """Test the update_ticket_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- tests.create_projects_git(os.path.join(self.path, "repos"))
- repo = pagure.lib.query._get_project(self.session, "test")
- namespaced_repo = pagure.lib.query._get_project(
- self.session, "test3", namespace="somenamespace"
- )
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- self.assertEqual(len(namespaced_repo.issues), 0)
- self.assertEqual(namespaced_repo.issues, [])
- self.assertEqual(namespaced_repo.boards, [])
- data = {
- "assignee": None,
- "blocks": [],
- "boards": [
- {
- "board": {
- "active": True,
- "name": "dev",
- "status": [
- {
- "bg_color": "#FFB300",
- "close": False,
- "close_status": None,
- "default": True,
- "name": "Backlog",
- },
- {
- "bg_color": "#ca0eef",
- "close": False,
- "close_status": None,
- "default": False,
- "name": "In Progress",
- },
- {
- "bg_color": "#34d240",
- "close": True,
- "close_status": "Fixed",
- "default": False,
- "name": "Done",
- },
- ],
- "tag": {
- "tag": "dev",
- "tag_color": "DeepBlueSky",
- "tag_description": "",
- },
- "full_url": "http://localhost.localdomain/somenamespace/test3/boards/dev",
- },
- "rank": 2,
- "status": {
- "bg_color": "#ca0eef",
- "close": False,
- "close_status": None,
- "name": "In Progress",
- },
- }
- ],
- "close_status": None,
- "closed_at": None,
- "closed_by": None,
- "comments": [
- {
- "comment": "Issue tagged with: dev",
- "date_created": "1594654596",
- "edited_on": None,
- "editor": None,
- "id": 1,
- "notification": True,
- "parent": None,
- "reactions": {},
- "user": {
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com", "foo@pingou.com"],
- "fullname": "PY C",
- "name": "pingou",
- "url_path": "user/pingou",
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- }
- ],
- "content": "We should work on this for the second time",
- "custom_fields": [],
- "date_created": "1594654596",
- "depends": [],
- "id": 2,
- "full_url": "http://localhost.localdomain/somenamespace/test3/issue/2",
- "last_updated": "1594654596",
- "milestone": None,
- "priority": None,
- "private": False,
- "related_prs": [],
- "status": "Open",
- "tags": ["dev"],
- "title": "Test issue #2",
- "user": {
- "default_email": "foo@bar.com",
- "emails": ["foo@bar.com"],
- "fullname": "foo bar",
- "name": "foo",
- "url_path": "user/foo",
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test3",
- namespace="somenamespace",
- username=None,
- issue_uid="d4182a2ac2d541d884742d3037c26e57",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # After insertion
- self.assertEqual(len(namespaced_repo.issues), 1)
- self.assertEqual(namespaced_repo.issues[0].id, 2)
- self.assertEqual(
- namespaced_repo.issues[0].uid, "d4182a2ac2d541d884742d3037c26e57"
- )
- self.assertEqual(namespaced_repo.issues[0].title, "Test issue #2")
- self.assertEqual(len(namespaced_repo.issues[0].comments), 2)
- self.assertEqual(namespaced_repo.issues[0].tags_text, ["dev"])
- self.assertEqual(len(namespaced_repo.issues[0].boards_issues), 1)
- self.assertEqual(len(namespaced_repo.boards), 1)
- def test_update_ticket_from_git_with_boards_twice(self):
- """Test the update_ticket_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- tests.create_projects_git(os.path.join(self.path, "repos"))
- repo = pagure.lib.query._get_project(self.session, "test")
- namespaced_repo = pagure.lib.query._get_project(
- self.session, "test3", namespace="somenamespace"
- )
- # Before
- self.assertEqual(len(repo.issues), 0)
- self.assertEqual(repo.issues, [])
- self.assertEqual(len(namespaced_repo.issues), 0)
- self.assertEqual(namespaced_repo.issues, [])
- self.assertEqual(namespaced_repo.boards, [])
- data = {
- "assignee": None,
- "blocks": [],
- "boards": [
- {
- "board": {
- "active": True,
- "name": "dev",
- "status": [
- {
- "bg_color": "#FFB300",
- "close": False,
- "close_status": None,
- "default": True,
- "name": "Backlog",
- },
- {
- "bg_color": "#ca0eef",
- "close": False,
- "close_status": None,
- "default": False,
- "name": "In Progress",
- },
- {
- "bg_color": "#34d240",
- "close": True,
- "close_status": "Fixed",
- "default": False,
- "name": "Done",
- },
- ],
- "tag": {
- "tag": "dev",
- "tag_color": "DeepBlueSky",
- "tag_description": "",
- },
- },
- "rank": 2,
- "status": {
- "bg_color": "#ca0eef",
- "close": False,
- "close_status": None,
- "name": "In Progress",
- },
- "full_url": "http://localhost.localdomain/somenamespace/test3/boards/dev",
- }
- ],
- "close_status": None,
- "closed_at": None,
- "closed_by": None,
- "comments": [
- {
- "comment": "Issue tagged with: dev",
- "date_created": "1594654596",
- "edited_on": None,
- "editor": None,
- "id": 1,
- "notification": True,
- "parent": None,
- "reactions": {},
- "user": {
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com", "foo@pingou.com"],
- "fullname": "PY C",
- "name": "pingou",
- "url_path": "user/pingou",
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- }
- ],
- "content": "We should work on this for the second time",
- "custom_fields": [],
- "date_created": "1594654596",
- "depends": [],
- "id": 2,
- "full_url": "http://localhost.localdomain/somenamespace/test3/issue/2",
- "last_updated": "1594654596",
- "milestone": None,
- "priority": None,
- "private": False,
- "related_prs": [],
- "status": "Open",
- "tags": ["dev"],
- "title": "Test issue #2",
- "user": {
- "default_email": "foo@bar.com",
- "emails": ["foo@bar.com"],
- "fullname": "foo bar",
- "name": "foo",
- "url_path": "user/foo",
- "full_url": "http://localhost.localdomain/user/foo",
- },
- }
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test3",
- namespace="somenamespace",
- username=None,
- issue_uid="d4182a2ac2d541d884742d3037c26e57",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # After first run
- self.assertEqual(len(namespaced_repo.issues), 1)
- self.assertEqual(namespaced_repo.issues[0].id, 2)
- self.assertEqual(
- namespaced_repo.issues[0].uid, "d4182a2ac2d541d884742d3037c26e57"
- )
- self.assertEqual(namespaced_repo.issues[0].title, "Test issue #2")
- self.assertEqual(len(namespaced_repo.issues[0].comments), 2)
- self.assertEqual(namespaced_repo.issues[0].tags_text, ["dev"])
- self.assertEqual(len(namespaced_repo.issues[0].boards_issues), 1)
- self.assertEqual(namespaced_repo.issues[0].boards_issues[0].rank, 2)
- self.assertEqual(len(namespaced_repo.boards), 1)
- # Second run with a different rank
- data["boards"][0]["rank"] = 7
- pagure.lib.git.update_ticket_from_git(
- self.session,
- reponame="test3",
- namespace="somenamespace",
- username=None,
- issue_uid="d4182a2ac2d541d884742d3037c26e57",
- json_data=data,
- agent="pingou",
- )
- self.session.commit()
- # After insertion
- self.assertEqual(len(namespaced_repo.issues), 1)
- self.assertEqual(namespaced_repo.issues[0].id, 2)
- self.assertEqual(
- namespaced_repo.issues[0].uid, "d4182a2ac2d541d884742d3037c26e57"
- )
- self.assertEqual(namespaced_repo.issues[0].title, "Test issue #2")
- self.assertEqual(len(namespaced_repo.issues[0].comments), 2)
- self.assertEqual(namespaced_repo.issues[0].tags_text, ["dev"])
- self.assertEqual(len(namespaced_repo.issues[0].boards_issues), 1)
- self.assertEqual(namespaced_repo.issues[0].boards_issues[0].rank, 7)
- self.assertEqual(len(namespaced_repo.boards), 1)
- def test_update_request_from_git(self):
- """Test the update_request_from_git method from pagure.lib.git."""
- tests.create_projects(self.session)
- tests.create_projects_git(os.path.join(self.path, "repos"))
- repo = pagure.lib.query._get_project(self.session, "test")
- namespaced_repo = pagure.lib.query._get_project(
- self.session, "test3", namespace="somenamespace"
- )
- # Before
- self.assertEqual(len(repo.requests), 0)
- self.assertEqual(repo.requests, [])
- self.assertEqual(len(namespaced_repo.requests), 0)
- self.assertEqual(namespaced_repo.requests, [])
- data = {
- "status": True,
- "uid": "d4182a2ac2d541d884742d3037c26e57",
- "full_url": "http://localhost.localdomain/test/pull-request/4",
- "project": {
- "parent": None,
- "name": "test",
- "full_url": "http://localhost.localdomain/test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- },
- "commit_stop": "eface8e13bc2a08a3fb22af9a72a8c90e36b8b89",
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "id": 4,
- "comments": [],
- "branch_from": "master",
- "title": "test request #2",
- "commit_start": "788efeaaf86bde8618f594a8181abb402e1dd904",
- "repo_from": {
- "parent": {
- "parent": None,
- "name": "test",
- "full_url": "http://localhost.localdomain/test",
- "custom_keys": [],
- "date_created": "1426500194",
- "tags": [],
- "user": {
- "fullname": "Pierre-YvesChibon",
- "name": "pingou",
- "default_email": "pingou@fedoraproject.org",
- "emails": ["pingou@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/pingou",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "id": 1,
- "description": "test project",
- },
- "settings": {
- "issue_tracker": True,
- "project_documentation": True,
- "pull_requests": True,
- },
- "full_url": "http://localhost.localdomain/fork/fake/test",
- "name": "test",
- "date_created": "1426843440",
- "custom_keys": [],
- "tags": [],
- "user": {
- "fullname": "fake user",
- "name": "fake",
- "default_email": "fake@fedoraproject.org",
- "emails": ["fake@fedoraproject.org"],
- "full_url": "http://localhost.localdomain/user/fake",
- },
- "project_docs": True,
- "id": 6,
- "description": "test project",
- },
- "branch": "master",
- "date_created": "1426843745",
- "tags": ["WIP", "core"],
- }
- pagure.lib.git.update_request_from_git(
- self.session,
- reponame="test",
- namespace=None,
- username=None,
- request_uid="d4182a2ac2d541d884742d3037c26e57",
- json_data=data,
- )
- self.session.commit()
- # After insertion
- self.assertEqual(repo.requests[0].id, 4)
- self.assertEqual(
- repo.requests[0].uid, "d4182a2ac2d541d884742d3037c26e57"
- )
- self.assertEqual(repo.requests[0].title, "test request #2")
- self.assertEqual(len(repo.requests[0].comments), 0)
- self.assertEqual(repo.requests[0].tags_text, ["WIP", "core"])
- def test_read_git_lines(self):
- """Test the read_git_lines method of pagure.lib.git."""
- self.test_update_git()
- gitrepo = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- output = pagure.lib.git.read_git_lines(
- ["log", "-1", "--pretty='%s'"], gitrepo
- )
- self.assertEqual(len(output), 1)
- self.assertTrue(output[0].startswith("'Updated issue "))
- self.assertTrue(output[0].endswith(": Test issue'"))
- # Keeping the new line symbol
- output = pagure.lib.git.read_git_lines(
- ["log", "-1", "--pretty='%s'"], gitrepo, keepends=True
- )
- self.assertEqual(len(output), 1)
- self.assertTrue(output[0].endswith(": Test issue'\n"))
- def test_get_revs_between(self):
- """Test the get_revs_between method of pagure.lib.git."""
- self.test_update_git()
- gitrepo = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- output = pagure.lib.git.read_git_lines(
- ["log", "-3", "--pretty='%H'"], gitrepo
- )
- self.assertEqual(len(output), 2)
- from_hash = output[1].replace("'", "")
- # Case 1, repo BASE is null and HEAD is equal to from_hash
- to_hash = "0"
- output1 = pagure.lib.git.get_revs_between(
- to_hash, from_hash, gitrepo, "refs/heads/master"
- )
- self.assertEqual(output1, [from_hash])
- # Case 2, get revs between two commits (to_hash, from_hash)
- to_hash = output[0].replace("'", "")
- output2 = pagure.lib.git.get_revs_between(
- to_hash, from_hash, gitrepo, "refs/heads/master"
- )
- self.assertEqual(output2, [to_hash])
- # Case 3, get revs between two commits (from_hash, to_hash)
- output3 = pagure.lib.git.get_revs_between(
- from_hash, to_hash, gitrepo, "refs/heads/master"
- )
- self.assertEqual(output3, [to_hash])
- # Case 4, get revs between two commits on two different branches
- newgitrepo = tempfile.mkdtemp(prefix="pagure-")
- newrepo = pygit2.clone_repository(gitrepo, newgitrepo)
- newrepo.create_branch("feature", newrepo.head.peel())
- with open(os.path.join(newgitrepo, "sources"), "w") as stream:
- stream.write("foo\n bar")
- newrepo.index.add("sources")
- newrepo.index.write()
- # Commits the files added
- tree = newrepo.index.write_tree()
- author = pygit2.Signature("Alice Author", "alice@authors.tld")
- committer = pygit2.Signature("Cecil Committer", "cecil@committers.tld")
- newrepo.create_commit(
- "refs/heads/feature", # the name of the reference to update
- author,
- committer,
- "Add sources file for testing",
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [to_hash],
- )
- branch_commit = newrepo.revparse_single("refs/heads/feature")
- # Push to origin
- ori_remote = newrepo.remotes[0]
- PagureRepo.push(ori_remote, "refs/heads/feature")
- # Remove the clone
- shutil.rmtree(newgitrepo)
- output4 = pagure.lib.git.get_revs_between(
- "0", branch_commit.oid.hex, gitrepo, "refs/heads/feature"
- )
- self.assertEqual(output4, [branch_commit.oid.hex])
- def test_get_author(self):
- """Test the get_author method of pagure.lib.git."""
- self.test_update_git()
- gitrepo = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- output = pagure.lib.git.read_git_lines(
- ["log", "-3", "--pretty='%H'"], gitrepo
- )
- self.assertEqual(len(output), 2)
- for githash in output:
- githash = githash.replace("'", "")
- output = pagure.lib.git.get_author(githash, gitrepo)
- self.assertEqual(output, "pagure")
- def get_author_email(self):
- """Test the get_author_email method of pagure.lib.git."""
- self.test_update_git()
- gitrepo = os.path.join(self.path, "tickets", "test_ticket_repo.git")
- output = pagure.lib.git.read_git_lines(
- ["log", "-3", "--pretty='%H'"], gitrepo
- )
- self.assertEqual(len(output), 2)
- for githash in output:
- githash = githash.replace("'", "")
- output = pagure.lib.git.get_author_email(githash, gitrepo)
- self.assertEqual(output, "pagure")
- def test_get_changed_files(self):
- """Test the get_changed_files method of pagure.lib.git."""
- self.test_update_git()
- repo = pagure.lib.query.get_authorized_project(
- self.session, "test_ticket_repo"
- )
- issue = pagure.lib.query.search_issues(self.session, repo, issueid=1)
- gitrepo = os.path.join(
- self.path, "repos", "tickets", "test_ticket_repo.git"
- )
- output = pagure.lib.git.read_git_lines(
- ["log", "-3", "--pretty='%H'"], gitrepo
- )
- self.assertEqual(len(output), 2)
- hash0 = output[0].replace("'", "")
- hash1 = output[1].replace("'", "")
- # Case 1: hash1 => hash0
- output1 = pagure.lib.git.get_changed_files(hash0, hash1, gitrepo)
- self.assertEqual(output1, {issue.uid: "M"})
- # Case 2: hash0 => hash1
- output2 = pagure.lib.git.get_changed_files(hash1, hash0, gitrepo)
- self.assertEqual(output2, {issue.uid: "M"})
- # Case 3: hash0 => hash0
- output3 = pagure.lib.git.get_changed_files(hash0, hash0, gitrepo)
- self.assertEqual(output3, {})
- # Case 4: NULL => hash0
- output4 = pagure.lib.git.get_changed_files(hash0, "", gitrepo)
- self.assertEqual(output4, {})
- # Case 5: NULL => NULL
- output5 = pagure.lib.git.get_changed_files("", "", gitrepo)
- self.assertEqual(output5, {})
- def test_get_repo_name(self):
- """Test the get_repo_name method of pagure.lib.git."""
- def runtest(reponame, *path):
- gitrepo = os.path.join(self.path, "repos", *path)
- os.makedirs(gitrepo)
- repo_name = pagure.lib.git.get_repo_name(gitrepo)
- self.assertEqual(repo_name, reponame)
- runtest("test_ticket_repo", "tickets", "test_ticket_repo.git")
- runtest("test", "test.git")
- runtest("foo.test", "foo.test.git")
- def test_get_username(self):
- """Test the get_username method of pagure.lib.git."""
- def runtest(username, *path):
- gitrepo = os.path.join(self.path, "repos", *path)
- os.makedirs(gitrepo)
- repo_username = pagure.lib.git.get_username(gitrepo)
- self.assertEqual(repo_username, username)
- runtest(None, "tickets", "test_ticket_repo.git")
- runtest(None, "test.git")
- runtest(None, "foo.test.git")
- runtest("pingou", "forks", "pingou", "foo.test.git")
- runtest("pingou", "forks", "pingou", "bar/foo.test.git")
- def test_get_repo_namespace(self):
- """Test the get_repo_namespace method of pagure.lib.git."""
- def runtest(namespace, *path):
- gitrepo = os.path.join(self.path, "repos", *path)
- if not os.path.exists(gitrepo):
- os.makedirs(gitrepo)
- repo_namespace = pagure.lib.git.get_repo_namespace(gitrepo)
- self.assertEqual(repo_namespace, namespace)
- runtest(None, "test_ticket_repo.git")
- runtest("foo/bar/baz", "foo", "bar", "baz", "test.git")
- runtest(None, "foo.test.git")
- runtest(None, "forks", "user", "foo.test.git")
- runtest("bar", "forks", "user", "bar", "foo.test.git")
- runtest("ns/bar", "forks", "user", "ns", "bar", "foo.test.git")
- runtest("bar", "forks", "user", "bar", "foo.test.git")
- def test_update_custom_fields_from_json(self):
- """Test the update_custom_fields_from_json method of lib.git"""
- tests.create_projects(self.session)
- repo = pagure.lib.query._get_project(self.session, "test")
- # Create issues to play with
- pagure.lib.query.new_issue(
- session=self.session,
- repo=repo,
- title="Test issue",
- content="We should work on this",
- user="pingou",
- issue_uid="someuid",
- )
- self.session.commit()
- issue = pagure.lib.query.get_issue_by_uid(self.session, "someuid")
- # Fake json data, currently without custom_fields
- # This should bring no new custom_fields to the issue
- json_data = {
- "status": "Open",
- "title": "Test issue",
- "private": False,
- "content": "We should work on this",
- "user": {
- "fullname": "PY C",
- "name": "pingou",
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com"],
- },
- "id": 1,
- "blocks": [],
- "depends": [],
- "date_created": "1234567",
- "comments": [],
- }
- pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data
- )
- updated_issue = pagure.lib.query.get_issue_by_uid(
- self.session, "someuid"
- )
- self.assertEqual(updated_issue.to_json().get("custom_fields"), [])
- custom_fields = [
- {
- "name": "custom1",
- "key_type": "text",
- "value": "value1",
- "key_data": None,
- },
- {
- "name": "custom2",
- "key_type": "text",
- "value": "value2",
- "key_data": None,
- },
- ]
- # Again, Fake the json data but, with custom_fields in it
- # The updated issue should have the custom_fields as
- # was in the json_data
- json_data = {
- "status": "Open",
- "title": "Test issue",
- "private": False,
- "content": "We should work on this",
- "user": {
- "fullname": "PY C",
- "name": "pingou",
- "default_email": "bar@pingou.com",
- "emails": ["bar@pingou.com"],
- },
- "id": 1,
- "blocks": [],
- "depends": [],
- "date_created": "1234567",
- "comments": [],
- "custom_fields": custom_fields,
- }
- pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data
- )
- updated_issue = pagure.lib.query.get_issue_by_uid(
- self.session, "someuid"
- )
- custom_fields_of_issue = updated_issue.to_json().get("custom_fields")
- self.assertEqual(custom_fields_of_issue, custom_fields)
- @patch("pagure.lib.notify.send_email")
- @patch("pagure.lib.git.update_git")
- def test_merge_pull_request_no_master(self, email_f, up_git):
- """Test the merge_pull_request function when there are no master
- branch in the repo."""
- email_f.return_value = True
- up_git.return_value = True
- gitfolder = os.path.join(self.path, "repos")
- docfolder = os.path.join(self.path, "docs")
- ticketfolder = os.path.join(self.path, "tickets")
- requestfolder = os.path.join(self.path, "requests")
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test",
- description="test project",
- hook_token="aaabbbwww",
- )
- self.session.add(item)
- self.session.commit()
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- gitrepo = os.path.join(gitfolder, repo.path)
- docrepo = os.path.join(docfolder, repo.path)
- ticketrepo = os.path.join(ticketfolder, repo.path)
- requestrepo = os.path.join(requestfolder, repo.path)
- os.makedirs(os.path.join(self.path, "repos", "forks", "foo"))
- self.gitrepo = os.path.join(self.path, "repos", "test.git")
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- # Fork the project
- task = pagure.lib.query.fork_project(
- session=self.session, user="foo", repo=repo
- )
- self.session.commit()
- self.assertEqual(
- task.get(),
- {
- "endpoint": "ui_ns.view_repo",
- "repo": "test",
- "username": "foo",
- "namespace": None,
- },
- )
- # Create repo, with some content
- self.gitrepo = os.path.join(
- self.path, "repos", "forks", "foo", "test.git"
- )
- tests.add_content_git_repo(self.gitrepo, branch="feature")
- fork_repo = pagure.lib.query.get_authorized_project(
- self.session, "test", user="foo"
- )
- # Create a PR to play with
- req = pagure.lib.query.new_pull_request(
- session=self.session,
- repo_from=fork_repo,
- branch_from="feature",
- repo_to=repo,
- branch_to="master",
- title="test PR",
- user="pingou",
- requestuid="foobar",
- requestid=None,
- status="Open",
- notify=True,
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, "test PR")
- # `master` branch not found
- msg = pagure.lib.git.merge_pull_request(
- self.session, request=req, username="pingou", domerge=False
- )
- self.assertEqual(msg, "FFORWARD")
- @patch("pagure.lib.notify.send_email")
- @patch("pagure.lib.git.update_git")
- def test_merge_pull_request_closed(self, email_f, up_git):
- """Test the merge_pull_request function when the PR was already
- closed/merged."""
- email_f.return_value = True
- up_git.return_value = True
- gitfolder = os.path.join(self.path, "repos")
- docfolder = os.path.join(self.path, "docs")
- ticketfolder = os.path.join(self.path, "tickets")
- requestfolder = os.path.join(self.path, "requests")
- # Create project
- item = pagure.lib.model.Project(
- user_id=1, # pingou
- name="test",
- description="test project",
- hook_token="aaabbbwww",
- )
- self.session.add(item)
- self.session.commit()
- repo = pagure.lib.query.get_authorized_project(self.session, "test")
- os.makedirs(os.path.join(self.path, "repos", "forks", "foo"))
- self.gitrepo = os.path.join(self.path, "repos", "test.git")
- os.makedirs(self.gitrepo)
- repo_obj = pygit2.init_repository(self.gitrepo, bare=True)
- tests.add_content_git_repo(self.gitrepo, branch="master")
- # Fork the project
- task = pagure.lib.query.fork_project(
- session=self.session, user="foo", repo=repo
- )
- self.session.commit()
- self.assertEqual(
- task.get(),
- {
- "endpoint": "ui_ns.view_repo",
- "repo": "test",
- "username": "foo",
- "namespace": None,
- },
- )
- # Create repo, with some content
- self.gitrepo = os.path.join(
- self.path, "repos", "forks", "foo", "test.git"
- )
- tests.add_content_git_repo(self.gitrepo, branch="feature")
- fork_repo = pagure.lib.query.get_authorized_project(
- self.session, "test", user="foo"
- )
- # Create a PR to play with
- req = pagure.lib.query.new_pull_request(
- session=self.session,
- repo_from=fork_repo,
- branch_from="feature",
- repo_to=repo,
- branch_to="master",
- title="test PR",
- user="pingou",
- requestuid="foobar",
- requestid=None,
- status="Open",
- notify=True,
- )
- self.assertEqual(req.id, 1)
- self.assertEqual(req.title, "test PR")
- # Close the PR before we ask to merge it
- req.status = "Closed"
- req.closed_by_id = 2 # id:2 == foo
- req.closed_at = datetime.datetime(2017, 10, 20, 12, 32, 10)
- self.session.add(req)
- self.session.commit()
- # PR already closed
- six.assertRaisesRegex(
- self,
- pagure.exceptions.PagureException,
- "This pull-request was merged or closed by foo",
- pagure.lib.git.merge_pull_request,
- self.session,
- request=req,
- username="pingou",
- domerge=False,
- )
- @patch("subprocess.Popen")
- def test_generate_gitolite_acls(self, popen):
- """Test calling generate_gitolite_acls."""
- pagure.SESSION = self.session
- pagure.lib.git.SESSION = self.session
- pagure.config.config["GITOLITE_HOME"] = "/tmp"
- proc = MagicMock()
- proc.communicate.return_value = (1, 2)
- proc.returncode = 0
- popen.return_value = proc
- helper = pagure.lib.git_auth.get_git_auth_helper("gitolite3")
- helper.generate_acls(project=None)
- popen.assert_called_with(
- "HOME=/tmp gitolite compile && "
- "HOME=/tmp gitolite trigger POST_COMPILE",
- cwd="/tmp",
- shell=True,
- stderr=-1,
- stdout=-1,
- )
- def test_is_forced_push_new_branch(self):
- self.assertFalse(
- pagure.lib.git.is_forced_push(
- "0000000000000000000000000000000000000000",
- "^0e6e0b6c931d65ee22f67205a53933d841c6eeff",
- "path/is/not/important",
- )
- )
- def test_read_output(self):
- here = os.path.dirname(os.path.realpath(__file__))
- # This should't block
- self.assertTrue(
- pagure.lib.git.read_output(["git", "rev-list", "--all"], here)
- )
- @patch("pagure.utils.get_repo_path")
- def test_update_pull_ref(self, get_repo_path):
- fake_pr = MagicMock()
- fake_pr.uid = "1234567"
- fake_pr.branch_from = "master"
- fake_pr.id = 6
- fake_pr.user = MagicMock()
- fake_pr.user.user = "pingou"
- fake_pr.project = "doesnt_matter_mocked_out"
- projects = tests.create_projects_git(
- os.path.join(self.path, "repos"), bare=True
- )
- tests.add_content_git_repo(projects[0])
- tests.add_content_git_repo(projects[1])
- orig = pygit2.Repository(projects[0])
- fork = pygit2.Repository(projects[1])
- get_repo_path.return_value = projects[0]
- # make sure that creating works the first time
- pagure.lib.git.update_pull_ref(fake_pr, fork)
- oldhex = fork.references["refs/heads/master"].peel().hex
- self.assertEqual(
- orig.references["refs/pull/6/head"].peel().hex, oldhex
- )
- # make sure that updating works correctly
- tests.add_content_git_repo(projects[1], append="foobar")
- newhex = fork.references["refs/heads/master"].peel().hex
- self.assertNotEqual(oldhex, newhex)
- pagure.lib.git.update_pull_ref(fake_pr, fork)
- self.assertEqual(
- orig.references["refs/pull/6/head"].peel().hex, newhex
- )
- # make sure the function works fine even if there's a leftover
- # ref from previous failed run of the function
- with patch("pygit2.remote.RemoteCollection.delete"):
- pagure.lib.git.update_pull_ref(fake_pr, fork)
- self.assertIsNotNone(fork.remotes["pingou_1234567"])
- tests.add_content_git_repo(projects[1], append="foobarbaz")
- newesthex = fork.references["refs/heads/master"].peel().hex
- self.assertNotEqual(newhex, newesthex)
- pagure.lib.git.update_pull_ref(fake_pr, fork)
- self.assertEqual(
- orig.references["refs/pull/6/head"].peel().hex, newesthex
- )
- class PagureLibGitCommitToPatchtests(tests.Modeltests):
- """Tests for pagure.lib.git"""
- maxDiff = None
- def setUp(self):
- """Set up the environment for the tests."""
- super(PagureLibGitCommitToPatchtests, self).setUp()
- # Create a git repo to play with
- self.gitrepo = os.path.join(self.path, "repos", "test_repo.git")
- os.makedirs(self.gitrepo)
- repo = pygit2.init_repository(self.gitrepo)
- # Create a file in that git repo
- with open(os.path.join(self.gitrepo, "sources"), "w") as stream:
- stream.write("foo\n bar")
- repo.index.add("sources")
- repo.index.write()
- # Commits the files added
- tree = repo.index.write_tree()
- author = pygit2.Signature("Alice Author", "alice@authors.tld")
- committer = pygit2.Signature("Cecil Committer", "cecil@committers.tld")
- repo.create_commit(
- "refs/heads/master", # the name of the reference to update
- author,
- committer,
- "Add sources file for testing",
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [],
- )
- self.first_commit = repo.revparse_single("HEAD")
- # Edit the sources file again
- with open(os.path.join(self.gitrepo, "sources"), "w") as stream:
- stream.write("foo\n bar\nbaz\n boose")
- repo.index.add("sources")
- repo.index.write()
- # Commits the files added
- tree = repo.index.write_tree()
- author = pygit2.Signature("Alice Author", "alice@authors.tld")
- committer = pygit2.Signature("Cecil Committer", "cecil@committers.tld")
- repo.create_commit(
- "refs/heads/master", # the name of the reference to update
- author,
- committer,
- "Add baz and boose to the sources\n\n There are more objects to "
- "consider",
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [self.first_commit.oid.hex],
- )
- self.second_commit = repo.revparse_single("HEAD")
- # Add empty commit
- repo.create_commit(
- "refs/heads/master", # the name of the reference to update
- author,
- committer,
- "Empty commit",
- # binary string representing the tree object ID
- tree,
- # list of binary strings representing parents of the new commit
- [self.second_commit.oid.hex],
- )
- self.third_commit = repo.revparse_single("HEAD")
- def test_commit_to_patch_first_commit(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(repo, self.first_commit)
- exp = r"""Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: Add sources file for testing
- ---
- diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_single_commit(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(repo, self.second_commit)
- exp = r"""Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: Add baz and boose to the sources
- There are more objects to consider
- ---
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_2_commits(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, [self.first_commit, self.second_commit]
- )
- exp = r"""Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: [PATCH 1/2] Add sources file for testing
- ---
- diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- Mon Sep 17 00:00:00 2001
- From: Alice Author <alice@authors.tld>
- Subject: [PATCH 2/2] Add baz and boose to the sources
- There are more objects to consider
- ---
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_first_commit_diff(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, self.first_commit, diff_view=True
- )
- exp = r"""diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_single_commit_diff(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, self.second_commit, diff_view=True
- )
- exp = r"""diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_two_commits_diff(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, [self.first_commit, self.second_commit], diff_view=True
- )
- exp = r"""diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- self.assertEqual(patch, exp)
- def test_commit_to_patch_first_commit_diff_separated(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo, self.first_commit, diff_view=True, separated=True
- )
- exp = r"""diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- output.append(patch)
- self.assertEqual(output, [exp])
- def test_commit_to_patch_single_commit_diff_separated(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo, self.second_commit, diff_view=True, separated=True
- )
- exp = r"""diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- output.append(patch)
- self.assertEqual(output, [exp])
- def test_commit_to_patch_two_commits_diff_separated(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patches = pagure.lib.git.commit_to_patch(
- repo,
- [self.first_commit, self.second_commit],
- diff_view=True,
- separated=True,
- )
- exp = [
- r"""diff --git a/sources b/sources
- new file mode 100644
- index 0000000..9f44358
- --- /dev/null
- +++ b/sources
- @@ -0,0 +1,2 @@
- +foo
- + bar
- \ No newline at end of file
- """,
- r"""diff --git a/sources b/sources
- index 9f44358..2a552bb 100644
- --- a/sources
- +++ b/sources
- @@ -1,2 +1,4 @@
- foo
- - bar
- \ No newline at end of file
- + bar
- +baz
- + boose
- \ No newline at end of file
- """,
- ]
- output = []
- for patch in patches:
- npatch = []
- for row in patch.split("\n"):
- if row.startswith("Date:"):
- continue
- if row.startswith("From "):
- row = row.split(" ", 2)[2]
- npatch.append(row)
- patch = "\n".join(npatch)
- output.append(patch)
- self.assertEqual(output, exp)
- def test_commit_to_patch_empty_commit(self):
- """Test the commit_to_path function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(repo, self.third_commit)
- exp = ""
- self.assertEqual(patch, exp)
- def test_commit_to_patch_empty_commit_diff(self):
- """Test the commit_to_patch function of pagure.lib.git."""
- repo = pygit2.init_repository(self.gitrepo)
- patch = pagure.lib.git.commit_to_patch(
- repo, self.third_commit, diff_view=True
- )
- exp = ""
- self.assertEqual(patch, exp)
- if __name__ == "__main__":
- unittest.main(verbosity=2)
|