[python-debian/master] Make deb822 tests hermetic with respect to debian-keyring updates.
John Wright
jsw at google.com
Sat Sep 6 08:36:52 UTC 2014
This adds a keyring that contains the keys used in the tests, and
updates the tests to refer to the included keyring.
Closes: #760488
---
debian/changelog | 6 ++++--
tests/test-keyring.gpg | Bin 0 -> 6889 bytes
tests/test_deb822.py | 36 +++++++++++++++++-------------------
3 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 tests/test-keyring.gpg
diff --git a/debian/changelog b/debian/changelog
index 696c118..7c68c35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-debian (0.1.23) UNRELEASED; urgency=medium
+python-debian (0.1.24) UNRELEASED; urgency=medium
[ Stuart Prescott ]
* Add sha512 sums to Release and Sources (Closes: #732599).
@@ -29,8 +29,10 @@ python-debian (0.1.23) UNRELEASED; urgency=medium
file(-like) objects that assume text/unicode input.
* Add a copyright module, for parsing machine-readable debian/copyright
files (Closes: #671485).
+ * Make deb822 tests hermetic with respect to debian-keyring updates
+ (Closes: #760488).
- -- Stuart Prescott <stuart at debian.org> Fri, 13 Jun 2014 00:27:59 +1000
+ -- John Wright <jsw at debian.org> Sat, 06 Sep 2014 01:35:24 -0700
python-debian (0.1.22) unstable; urgency=low
diff --git a/tests/test-keyring.gpg b/tests/test-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..dc9d0bafc6404b0dc2055da9cc6721afd199ca37
GIT binary patch
literal 6889
zcmbVvWmJ?6yY&o1cgIjegLH?0w1jj>2slG`4qZbiAf1B1NQWTZD4i10A&t_dNJ at Ol
zbI$uc at AIDZt+T#Av({YqkG*GK`@Z&`3}7Crw5^aF5h|c+*uQa_W%+tZU at x5N#)BG+
z?@xxigw#}iSGpm_phw;z;WiY-1U5G`u{X#du*s0g?Nl_L&`N_3_K0RNu|DM27%Cg=
z;Ky;2%q-q|#wHp9;H?0Tof!Q at WSwl3J6|n6>>C|^kMwQdquIiTqMhXcikI+|8eR#>
zvt#cWW7PuQMjKQ at SRuJDQ(g+S7Y(geH&iH2gYFDV2bJfgJ?Hm&<gfVn at yo)CJPT at S
z#79RTQ;*3N;f{hrD4*H%Kn^RU&2s>A-*1PC4?bm&`poY#bms^%E!1r*Y?JeHe#36v
zz4+#3v<8c&p{(OL21YO*jN<Mzb*&CxT*t`!P5l}S5DX3^iN9;V4YusmXk at aW1hGBq
zeHn!cD2xqnpt9e&KItfEtbAROPH)U>NO03MFxH_%uU$i-9auvRH`2MalprCl$@41m
zh149$*(xllQukoF at _%YkcGi4Ot-XNdabBI!6uq)dCCjWb-_q~`veS;IVIQ%;UZw{$
z5Om2{V_vvKwd6KlU0+Hnj3Zy4{18s%{<5#VqmDt<#nu_})ZNa;))OLW|ND!~pAYZ*
z0gsEjjdY|XDhUxbfEk4vghB^Ip$I{t0-~YlW>z?%;b386fY8XWu`qGa$WcH*000|{
za9ob+rJs)#)JG10)Co{n!$E3o8?UL86K_*5;?5J60kUwvHO1gMCXeyNYfszUghy0q
zt{|#V0H8XWe<$PNEn{f~vx7SS#RGcJgW+F1{x>A5j{rH`i){uIOOJIz?A^kvLhI5n
zVbBIZjwFubi$!?47S5^p!TC%KsyMrS+&u}pe<$%r5vZLf+}X;5$HK))I`V&{;r##B
zB2@=~G-B9R9cg3?_==7K#!QDVk7SAt0^Ww$9fdHbh4RK{a4<_1siIN8*E_qX0r?La
zJbx`k#@6*OA}XkSM3?|9G?XW5x2Y(!kiUz+I}AYT^<|;mIs?4xP&Cf6ubwW#G%sZV
zNPYZJ2%)~Wk?k?1eAi1o!L0EP+<QRA{{WP6a`Ccrw()>lIC%WEf`38krU>l+1G3>E
z0I7u=v?W{qGf>eGUB6^}I-s>V<^X_%A!rcaVDU6Mr~x|V`g=DzFT}m>A({Uj(&N8=
zpoNR0i-#xF(~8H+5-uJ2FHp7a%IklC7L@>y##ldepr4j;HIR8tNBsFCl#ITl0Hgz$
zJGUssj9!q!lJ@|xNLWVzw!8=B_ at 6<ooNe5H>-ulVF25B<0q~-sD7<IQV5f!X+1hzP
ztel{Bju5D&rMs1f2jus_*#+Y0;%sB(4)KCI+FA1aeGlah0Aw&~2Ptm33R_-$aZm89
z#Q0lOY$-sFU=PI6?~`2qnu`fNYUR1ec1058o}cL7`LWBwE$v(&D$bs8J5M_oXO91R
zN1=blcK<#7haY|~=bt+5vjdRO^-3?Ejm?(p694!%3r*8ExVW5v90n6zb0Jb7J}SuU
zCRA`4y9Mh(>K`7>K)gTaTY(T2P_cyT|JkGhSv%!^$17<))O^+36)Q>dFpY at QRqjct
zk0%GoPJQlx%coK|ljHFam3I)f#epCG%M~BV at JZW0yzOsvwW^OLBbukXjsLKq?@6gM
zjzNe;3R{YPLPX5|WX#N8hBNQQnylDnE0U}Cor=!VW?ZiWhS;3t)-OW?W)J{`4!Tpw
zP$cx^)bV2Fv_4J4%$>0s#iaa1b9AO7AsxSJNiyO{K%%)?f*I=|Fs(RYB(TS}B=Ppf
z?11dsY_?%zOp2cmMqXuR+4v&=Wp3;F*i%QIw!0nB)mdF5)+o_H at y7{}!3O=jpxyk4
zTbjZ$H&1l}k?Ed);b0PyoD2kzR&<S2LZ$p|26Qx(KdStF$9aptUv5qvHCGq4_3x{x
z!Yi=~b1|Vl`~aluu>A{bZRP!lDxY~%{|+BfkAA*C+Ge2Op{inj+5r**-X+1Ghzpiz
ze(=N&c<+zGL7K5;dN7<;m-oDECyJD!{%WxS at VWwO;oeyog1r3dRcK~8Rglk~r8u$c
zwV@`NzS^Z%%zS>B*k|5?q7cI$1{9|lWb0?=i}KXw2b3&mLkd_Yp*071;c={P`s$09
zVNA>Txvt}4;}D0SUhD-RBgKMl*LeCFs(JyBpEB;zSU$P9+Qp088Io_xRhzS4ZpYGc
zcZ(sdRGK4ZX<DMr6|s5|B5mtNKqb^MneKWD?|FtIMk5kjP=kJWQpN6;T4mSS(Z^UX
z<m;UG7HyxEG=ro>rgAu2XDOsEA3u;1no$8F<OR-V-V^I-65$`om~uo)nal`3+f*pN
zj6^6!h-fD9Qgz8U!gdx>5=~5b#D0!=V>v>>Z#p4@&4hk-XexjynF)bFyh3`pP!`0a
zIhtQ#wVt3da3P>WeDq+%TG`vR(FMI{7V(~MjcHvdcAeWXI}7gJQk|t(IdFv&?GDg^
z<HRl4#|&VKj$Pp>7Ot|DDp$uJL=#Uwr3Lzj5)8LI`1#>N(|cY339tX&wQ at DW#65zE
z at Hu;^oPn93oA|N7$#9CcTY5&L0dsz2tDZj&GkyTi`WsQ7HHJ-$pr*qGp+L_a-z;@1
zzb;t0iGCXwUE)N&k%(gND_s8OG<2@**JelLqI%#jQ^GJs01*%XtYegQ_OOAvL*(G@
z7Pe4#%imE9y`RVk33Bt_-`*$`NmLRbHh}GS{{3gz{FTgTD0=AZk!V<W?cFJV9NH$z
zs53-!X~`K%aK>y=RA@%e&pv;qMN5g9tR$w<_`EZ at mv#siDD3Jktsls!_8HiXtf(it
zX2Qj4^kXF)5$-a=ADz!!jz966Q^lz~NyRE3$Nqt{j00Yxac_|lm}}f<>vMdqo3!g4
z8q4bCASd72EN`eCG(avCEn&Z320p at Y^$iO6qA9VlbI9YnO17>!j9zqzymawVkK<Fz
zUq)6UU1}n~@_u4DktG><kT2OmuJU<xfY2O&vYt at sr$a3X<EeW>H at ir+I>e}gN9EYc
zjl&FW;FqNdGEahk|HMPzU$J5#t+D5tusq at HQXvt?O!o)mYp$-Zt87wQR(JiP!1R}C
zMazgH*ST&l3ea_QeUGP4%n3DS7o9$sYAZAR%BUhLmc&7|1l<3u+8cIa#LHsfYwl00
zOp3`4Zk2P~-!vc~_tTsxL_}QKgAA0^32%i5xAP`QUMLdjELbEc1&`Kni)kI<805f$
z(Wl})X7tJ-rbH?wbV$?WATeXJMGTJB@>!MC5PH6h=bo?ahYweJQKsedoUwO}G>;0?
zj^g2ty=@_{QW8tcpqFcEEc;l{z_7w)uL?Ci88(b+6wd8OI<R!}p0Vc#=ZR=RSIL%y
zsc;S0Box+}8~GucDIa49kDM2t?Ny7dP47gg9bS5KWxp^1R!1l3#m8TbW+7 at r`vp9>
zj~2pz+AIo1>i^qR%!dSba-~$A2H<bB`C_d;w3KwcZj#9ZaZ<`>v9BsliM9*VqDa<)
zySJpid#+WIjWU%!eRUbnLvp>FM!Up85WXZ*zER5`??yX|V7?uBGG%`wzfa7!(f18i
zUrCw6_zwA9<UNtX<uhASr at Vd6!abIbr{{4b^yv;lU at OKq$&r?nx{xoVix-Ewis}Q-
z#;!BWLgTI`h>GQ|@}msl=7eZ&sn#Att7*^h>#ON$-%h5>qU?eR{@McG1AX*bT*f1R
z%zhj#6F20t%L+b<rE5-0QCo!INRV`}K$*x2_)SATiK63LuGs57$<7t_b-sl~j?Gl|
zCvpN_LUJnM+z)aGqf%0g;=%P>6<W^2a*DA_3p-GUG|INk8#PlVg&%JRPtl}#tvhDH
zWfajYFAD+y4{9%?>$IgDj;G$>z#ayW%fjy_!?KHb#ypyb-q at ZB56~Kvo}mcPnvq9b
z26vlIs?Nh%nmSQm^=cJwJiaT{%VLsxCp;;b>P%!#J$J*kpXn~Egy&Ee7PJU%HKkr3
zA!v(9m7*>+<|;i~_b>W-iQQE!pw`o4bV~;Rj#u==5bpTpS;aLMj5$Q}2V$V!DF+P=
zZ_BbWf<oiYi*a$S0o!sSi&&cdF_Fa^uiKS7E>VN%Z&o+Jj`!wGL5?}GO_!LYDI$D)
zToi9wbK(M#RM2}@G5^z5|2kfOYw!PSry>6He1R1ReqoS!cT=Oi&i`C3Rl<c<9C-#Q
z`8-c6qyJ6t*KyN?w~zhsS}ViQ;bZPGnkO2Q!_q?8`>W3pH*_F`hapwNWOGTaH at c9d
z-Fu9D?nhCKEy0m->(;7}%x4!#foD67oQcQAPE|KLH$BDVkk3>~5wsOwZM}U9RFEgE
zbK40DaY4c~6T~AXA5-|$p9VcrIGC`&ctJ(uO at mu|u<>jzr88?)Qg{Wut0&(M)306{
zhha<ROH_z#E_=q6HQ&uk^FA2^H;p`jw|XDEo4gffH5Wcdmt>KD-$WMsH0vMa5+or-
z1~@Z}=qc$7MRNL40t|C1n?mXX_%+`aCALm5Q!-IU?YkG?hiUOqq?U&=56y|GNNSl1
zz&D+ah6{h-qD8}R?Rm?tupP0B+z>4L=IX!_ZoGh+T5V=Xb0!v6vh2(DX6ZYfh;8QJ
z!@JYc7hGLICXw^{gb9@%IBg5Ibg?6~9g5IVO4D0%kM8mpL$<_U7TGIo&+FY%*SPwh
zt?%xOaknJP`}WWOC>Kb3y?(3|am<zG(aO2tW;DW1AoyXZ8<#tPP7zo=eF at mQosSi*
zY`8&YFE=a2(R2lv?*=UswDsILy?QiWISRY_#i-w-Md#$eYd}vBhDK${alPjIJ|Wk{
zXZ;a8!A~_Vta^voN}??ad+g^4nu at d6$A(h9`$~FWn}$t(*QOPM;$8EB2cDyVQb`)#
z^!j9uTIEPxE1ZieshG_RY1|3_Sb_ew&pEDktE9D*6T=}Z*2bgB`p)w6Q5upUyW-lO
z6 at wtic&jw1(^(IEX8}<ka!nDY2gS4K9aFjZT0aX=IImE7)O_Y8LqgY{*oc|X%ocky
z@|{yVF2t3w&TYmiWPQbcf+>|1Vf)pPN#m;ca=!(C-ajaC*$`0=MjvL?02b3cu(}-4
zV$9<n_F~{jW-K(fa!qA<%G2%~!E{<>4gVRuGw}Xxb?)t8zi;+p`*~y&!a4U#Y09Md
zAmv3H9{s5G)W`V>a%Pcfy at lFLl7%*YZt028bXbe7%u7IRiJ})v0eot&xicNb>VrhP
z7b0>h;;tj?u>p+GZ|;ep{WK6~Q6lpB(6g6^N~(|UM%1>r<~Q<AF1q?!zTTEL0k9mK
zW53FKj%}V~$vZ}e<Doxvc_;X|nAkKOo+9g%xXZG2h}IBFOm0*|*l?h0^0L>G>&v3O
z!;}r!k8p6 at r^F7bn;*?A)N5}NG_udEw3^jEEZV_YhM_r;)m7ox at 2RMqjrTsp*d at 1H
zs#b3^HE>-BaQx(M6?>o~0C;ls)l4^8F$uh-qsmOjR=dpi3NkR>YMM<5Te#cRhz8S^
zMHl;vP$z&2>zTp@$Tevw`h^|2zE&0 at PC2q{Us>GOrYKYeRLb9#hyaBe<-Yn<-`@@$
z6pl_)2rAX at C%@aeD(0}spDq+a!XmUJ6gaSC`nz;Pu3UcK#JO_aM;{k<iCQDri#a?s
zaAYbg at O-`~d6<WR{pVgs>_s*y@;(1FSy#1kOf?WFmrmQ?YAHJ!@j_3VKgUbQV_<-{
zs9*1$dH4}-GK|`xnRa$dw|O|a33eLlY+2Q|r~LE>&;+|7*KA2CFcO-cKSP$axi{K5
z>k2PfD+TbdthmOvXnkak5iraO;{Xi{Px`I*ort)6$IaT$JCXEcphiLbG!ZCzMXXa)
z=1JBd_MN4g1fY}`D789_=Qc~Lq|#+Z&B+jK{PAUNA~}fhxqcY?ws69yN>n#LkFKW`
zj3PB<^D{Oao3*@-Gt+GD=Nc*96OA@;q>nqt2 at CL4UYw2O!<u;$w7;Cs7(+GOFumRx
zhu%SXo}Qh~BfPW1o|r8!=Ea^ix2L=Kdxx}a4c<vM at s)GF>-#n{O1(R7kYGgw;Bcv%
zmJu~us$?sLfQ?^M0auAuGdeVJ4L2+}n1gnYtY%32>0?>GDlZ#XBx!{RA7YCfI`QQi
zAtn{rojA%8fKGba3`=V;FKjIBa;dS(JB*C$o-<bO`4g9<RoK#ggF5?_lSaF)DUOX=
z2?^|R@@;ua!u9sBTKm3LV)e%}nDtQPhW+OUlA|We3ssqe=W>IMDTZK0V2W{elV3}6
z`vlSGG;Ep)^r5j^RaaLx=j2g at P*L9hZN|w#1h*3Gp}>t;i4JnI1^}B5%ph-Hbc({3
zT%1Z6br*x9q&$1?qUie}K6pe>Q#GJKD+v at AL5cez;o#K>u*%LO>B2)P5iJZz9B3|N
zwv)vEDLmzB&kn<hJdn4uEct1SWsK~jLEq`mVu4CK3s at 0c!&DkuR01fi#+24o3!S#`
zHWU8P7kl6beRD>M@;K9-phvuTok15l8sl46j-e9I4fF+^=+FX0#7Q(NgvH^RQ~a)(
zn9N*(#yjXWj+;NKUEO2bgFaj?f|;5LO6Jnl8D<hchttS-eIYgXbDMG)!TWdxsm6O~
zW4c{SoS;-REc;m8`sbrUyWYFcj7om0#%ZP@$_R~#wH^KeO=l-o%}4e#^sFQ&W$ptq
zi=3i)$8H!~b~r=yop;B!?k^D)ufslQCU=S>oK}MwsSJYB at jYY?jCE^5K7D#JE`R~b
zyb9vV_r{CReQb{112*bWt1*sSpU@@@!w*?Yi}Xfdv>GzRm|9FBuOT%N5vh19>m_a_
zXf{A2nKNZ0KdS&P3s<*VMkwv|1 at _Dh*{_5_{?79ftfA^+o}j_KP}$`LQn<%+6Uq8F
zcyEACllmrB!doMgo#gA})g--g*0RkRrbN$bx`wbEHXD0RHnuFBCMi6iuGrM2(W)sn
zEVqjUw911Iy~RYztZQG)@t5J4;NcDbEn232N6SoPTx5_Fs$-~&HD{vS*U?Tqz1d5H
zwQ at D3q0DB4eCnn{WGiZpAgQt8=V6!ElWL+~s6RQxW0kK7q at izT`Jv=y?tC0PcsHce
zk<a*va*pNfu-+!_){A1-&S~RIT(?o772ok5bTKMTjqDzi-O_YZ+(;qm=Pyh|e-baI
zwR*2yGPAzuNs7#5`8hE<T$3$3nOs<P_<S+t23PL7QghS`(3S0aX88dm{I-D3fRRCQ
zwKcAu)w;Vnwo*Bv)5L_$HZA<gu6z})K|o#>f}_~WutGgb*t{4xWhd|o#4C&?_><FZ
zUT2ZfQnP3=Me92WsB7Jbt!$*{9hvA2X6Xvtm-X$nD at 8Dlh#*H;t7#3P=brFF4q*}L
zdJQ0L6RR)V^w)veswjT(ib4G+THLaQ8A6U$Bmb%Tq1^L=_FnkWG5k^*md}qf-|OpD
zeJvsn*4cnI;k=N1x1!$zBDxCW;(HXCu61&eVr06%OlEf}a5BMmFx;o1cIc=DQ4Qz&
zN^a`LEpq71;odRV*E&0UY3cICi7S#SKW50EXzZfjBz2=Ys31kErs9DDLG>Vj3PO24
zG5r4AI{3kJmKtizU#Ew!>chyg2HMm4WQesovPh-V*4{h;IU_E<Zp}BrblNow$J{Cf
z$kmvP%x0-PKZJNA%jJDnmm*&CCcaMoD_T%k{ySQ5 at 1v#jPqcJx|NUQeI5)wa!al)z
zEP+PtmEBtZZASIL`6p!`uZ@(x+-1#zv0#A(WLrnniA}WmDck~~A at MF5;in1lWPMkb
zEp}WKs4TzP%&*Z&BvrkYn0lZd^!!tNLPChD2Sr==m1j;sN-BUoctPevaj at NLoQ7AJ
zY at MY--^D{47zx%xqhQI$>6lu at jn9|dR|RW32}nZ}#^TO5AAQb-RTJ)Hde_N3I5Yfm
zA)}ODEl2;u4SN+|+BbFCYq4&~6;$p{Dr0&KBOOP-1sn6q1S?w;lo<z|n23hN4(bj#
zWu|bf+FIUNTun!!Zwy%1HWJqE1y+uD;Bjmu1uAS3X5*)ttzK}`-6)@^uuzHV=V*`}
z4&%KlHAPR{qY<KuVxVIQwk3Tg-;6#A=KAQfElDwEN~(&EC at Av#ayBk6n!TBaXB(!}
zw%pW(EU|YH*QnFK<0)GnUf(#ad{6m2jF*S+n-VtXcV5qI$Fr7hlawqo$VQ?PJ>7Id
z2&_e1yuJELfhC`Ps`f-+uTbebLpwln&lhSlN7GRt5j{-C->bQO`&h1MK|CA{_wbSN
z8%c#m+7m0RcgJcMYi at 7^$K1eaa>W<vmPkws=ohJx-QHRASZjRR7mP6%5l^iy!kT<@
x6(9S&#V)pnSM5F)cmnVxCGCZ5J>AIStgZ*s at BXN*|Hjq-Nv~{Pb@|Wj_&;udIhz0g
literal 0
HcmV?d00001
diff --git a/tests/test_deb822.py b/tests/test_deb822.py
index 40049a6..9778161 100755
--- a/tests/test_deb822.py
+++ b/tests/test_deb822.py
@@ -34,7 +34,7 @@ except ImportError:
import six
-sys.path.insert(0, '../lib/')
+sys.path.insert(0, '../lib')
from debian import deb822
@@ -281,6 +281,8 @@ PARSED_PARAGRAPHS_WITH_COMMENTS = [
]),
]
+KEYRING = os.path.abspath('test-keyring.gpg')
+
def open_utf8(filename, mode='r'):
"""Open a UTF-8 text file in text mode."""
@@ -402,17 +404,16 @@ class TestDeb822(unittest.TestCase):
self.assertWellParsed(deb822_, PARSED_PACKAGE)
def test_gpg_info(self):
- if not (os.path.exists('/usr/bin/gpgv') and
- os.path.exists('/usr/share/keyrings/debian-keyring.gpg')):
+ if not os.path.exists('/usr/bin/gpgv'):
return
unparsed_with_gpg = SIGNED_CHECKSUM_CHANGES_FILE % CHECKSUM_CHANGES_FILE
deb822_from_str = deb822.Dsc(unparsed_with_gpg)
- result_from_str = deb822_from_str.get_gpg_info()
+ result_from_str = deb822_from_str.get_gpg_info(keyrings=[KEYRING])
deb822_from_file = deb822.Dsc(StringIO(unparsed_with_gpg))
- result_from_file = deb822_from_file.get_gpg_info()
+ result_from_file = deb822_from_file.get_gpg_info(keyrings=[KEYRING])
deb822_from_lines = deb822.Dsc(unparsed_with_gpg.splitlines())
- result_from_lines = deb822_from_lines.get_gpg_info()
+ result_from_lines = deb822_from_lines.get_gpg_info(keyrings=[KEYRING])
valid = {
'GOODSIG': ['D14219877A786561', 'John Wright <john.wright at hp.com>'],
@@ -434,13 +435,12 @@ class TestDeb822(unittest.TestCase):
self.assertEqual(result['SIG_ID'][1:], valid['SIG_ID'][1:])
def test_gpg_info2(self):
- if not (os.path.exists('/usr/bin/gpgv') and
- os.path.exists('/usr/share/keyrings/debian-keyring.gpg')):
+ if not os.path.exists('/usr/bin/gpgv'):
return
with open('test_Dsc.badsig', mode='rb') as f:
dsc = deb822.Dsc(f)
- i = dsc.get_gpg_info()
+ i = dsc.get_gpg_info(keyrings=[KEYRING])
self.assertTrue(i.valid())
self.assertEqual('at', dsc['Source'])
@@ -1140,12 +1140,10 @@ class TestPkgRelations(unittest.TestCase):
class TestGpgInfo(unittest.TestCase):
def setUp(self):
- # These tests can only run with gpgv and a keyring available. When we
- # can use Python >= 2.7, we can use the skip decorator; for now just
- # check in each test method whether we should actually run.
- self.should_run = (
- os.path.exists('/usr/bin/gpgv') and
- os.path.exists('/usr/share/keyrings/debian-keyring.gpg'))
+ # These tests can only run with gpgv available. When we can use Python
+ # >= 2.7, we can use the skip decorator; for now just check in each
+ # test method whether we should actually run.
+ self.should_run = os.path.exists('/usr/bin/gpgv')
self.data = SIGNED_CHECKSUM_CHANGES_FILE % CHECKSUM_CHANGES_FILE
self.data = self.data.encode()
@@ -1174,7 +1172,7 @@ class TestGpgInfo(unittest.TestCase):
if not self.should_run:
return
- gpg_info = deb822.GpgInfo.from_sequence(self.data)
+ gpg_info = deb822.GpgInfo.from_sequence(self.data, keyrings=[KEYRING])
self._validate_gpg_info(gpg_info)
def test_from_sequence_newline_terminated(self):
@@ -1182,7 +1180,7 @@ class TestGpgInfo(unittest.TestCase):
return
sequence = BytesIO(self.data)
- gpg_info = deb822.GpgInfo.from_sequence(sequence)
+ gpg_info = deb822.GpgInfo.from_sequence(sequence, keyrings=[KEYRING])
self._validate_gpg_info(gpg_info)
def test_from_sequence_no_newlines(self):
@@ -1190,7 +1188,7 @@ class TestGpgInfo(unittest.TestCase):
return
sequence = self.data.splitlines()
- gpg_info = deb822.GpgInfo.from_sequence(sequence)
+ gpg_info = deb822.GpgInfo.from_sequence(sequence, keyrings=[KEYRING])
self._validate_gpg_info(gpg_info)
def test_from_file(self):
@@ -1203,7 +1201,7 @@ class TestGpgInfo(unittest.TestCase):
fp.close()
try:
- gpg_info = deb822.GpgInfo.from_file(filename)
+ gpg_info = deb822.GpgInfo.from_file(filename, keyrings=[KEYRING])
finally:
os.remove(filename)
--
1.9.1
More information about the pkg-python-debian-commits
mailing list