From 207ce714d47983a7f402b4cf842190a98439b3fa Mon Sep 17 00:00:00 2001 From: Denys Date: Sun, 2 Jun 2024 21:26:21 +0300 Subject: [PATCH] Fix time-machine tests wrong regexp matching --- src/tests/cli_tests.py | 2 +- src/tests/data/keyrings/7/pubring.gpg | Bin 1251 -> 1239 bytes src/tests/data/keyrings/7/secring.gpg | Bin 2553 -> 2541 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py index 0666224ec..2487ba58b 100755 --- a/src/tests/cli_tests.py +++ b/src/tests/cli_tests.py @@ -4072,7 +4072,7 @@ def test_allow_sha1_key_sigs(self): self.assertRegex(out, r'(?s)^.*\[INVALID\].*$') ret, out, _ = run_proc(RNPK, ['--keyfile', data_path(PUBRING_7), '--notty', '--list-keys', '--allow-sha1-key-sigs']) self.assertEqual(ret, 0) - self.assertRegex(out, r'(?s)^.*pub.*2024-05-27.*EXPIRES 2026.*sub.*2024-05-27.*EXPIRES 2026.*$') + self.assertRegex(out, r'(?s)^.*pub.*2024-06-03.*sub.*2024-06-03.*$') ret, _, err = run_proc(RNP, ['--keyfile', data_path(PUBRING_7), '--notty', '--password=', '-e', src, '--output', sig]) self.assertNotEqual(ret, 0) diff --git a/src/tests/data/keyrings/7/pubring.gpg b/src/tests/data/keyrings/7/pubring.gpg index 931b28977baa0769f4bb3ca013d5b656ceb4b6be..97fed784f327c41c78fadb9da7740651f5c24081 100644 GIT binary patch delta 1179 zcmV;M1Z4Z;3D*gK#=uPkW?mK~0SExfz@#-s$(;+Eqz7psglx%>BAxdwPDQ&d(xitG zZ6NZg<)`6NdT8hT36u)kXPO}Eo{!`N?HRgjFUAv%U!~>U7{{2}5 z)vfR+G9(m*TH+`*;Ds;(Kw+fq`JJ(SxDe4Exfh0GYv`(fm$scSv@r~`YIY3z1p;PX79^8!0T_P=`3%YG2TfBz)d&A~A{6qJga_i2-Ij+K+5rF)xGlx{U~lCt@n{0xa!sh*k}56;rmDTYxVw<`9_fEOmmpNS@mPXdQE}DT znJ6;9`KCdF7cH{-H5Zx_Pb6YPd3E&fPS<9+KNx-s6jNrlY*qt#5w+5Sj2sd?%swa< zRq#}q8|d!Wra~1eV(g&3E0k==q~0#*e%Z{t!(pN?zPq`UESV~Wu#%^mAJ-a>O0hWa zReV971>OIHd8L1O<9zq@$-BI8n~(x(SkAyr1ZG|qBmoEj>f*I>#Q|Rqs8BgH8xid* zHcH^L;*fmSi?JI>K2(`Uu&03pdSd#=@p=$|H=jgZf74AVye>4oB75wBU?<}Ifin8U z-)dH!Y)hW+ODlfZEhFIVP5_@9SWo4t7!_OF&$fa?+m$y=ldMa)2}8PTLCe*3LGN0f5( zd#(@@RgoY}ZX_RuD0?r{LSC3AL%K0?J#1#NOJodUelK+Gy^hT~;)?tn;1R+^)t4d@ zdxs~eo2-AL1X-7gY(xA!^WP&I7g9CoRe^U?$$D&q6|n#j0RREQz;*-}0RjLZ79j+B zJ;X%?LcSOsI(`TT`3%YG2TfB20%l$oB?21^0162Z2l))i>IY3zmG1}sIPgDI{&LY+ zdp6njKvq9T>fFE+@}jsV?MLrtdBKf52>9qZK zue4in5AGu%H}Jr(nYWSt<4l{S3Ot7{3pdYvEnItQ^K`!FB6z;Iv-2!;D;m7Z?%tQu tZ7JTO4lI+_2I8WDPggi1?eKN!CZeZ;7@c8B>gfVy$G{{57t-RHt{+QODO&&l delta 1211 zcmV;s1VsDS3F8TW#=uPkW>e6T0SExT9NOf1Hnb>cWN&Vw(rR-&3Nb3UX?YEI4(oWr zA)8f;WBk5U3G>iM`B7SavF8&x`Yh-x&Y!~bez1A}*?3xcpIrShDg2tAzc?~(gZ_Mm z`w?uk96}}f^ak))tE5R$!vtFN;;gLz=^a#+o#J1;-$5473n(HDZ0RxoOe9+1LyyJ&Ay^^SKFb~rj)0lRo`K$>^R zyL#GbGuM_4)*0L9bv{dxn;AyISid4Dtu zXKG9J#GKoh1Yo5%>T%ogWF`!?*kH#j=K-8ytOo)K#o6t`v)5^%`3s(6VrRubf~f#! z@&_GQPRwmARLr>xoRnZ=AY=GbX1}I}{TPSx>4JV)KWFsI(*`p)ejB2Zvb2 zZf03dyQzeDkuc|TXPc{7vUgugqE^i+-P3sB3o}x?oIB4Fq{0O9VTB+F{s8~pT`A7M zO$26B(2@ZN0JcpWWYcvALV0{Fk(tz`{L{+*y$uaPbz5L-MJY9HLyLfq;(u9(O2^av z$TxzJP{}kB%IS`0GQxVaF=%awICL!wj~*T*$+7Oqc0moL+eb&u-b1fqNS5mh6*w?E zXQgzaFkExsFfoP#Yf*naIi+atCcd+5kKp(&!Fbg^D#)C#rf0cjvKZFg>j}?nYgn@% zTL!*cDI2(%+mHzd>sSC#g@4if%3bYU;eU7;NrSz>eu~FW(z~EcebG>2bou}!$u7?2 zzGflPnt4^c>A9huoPE5$Da?}F^XyhS@n41i!y6nzxIIGmX^GN8fKF`%Ps5ocFX6Zu zb3%lW{L$$E5di=J!oYk47y$wRCKe$C2oJhdwCCTjFmw0<`bD_{7k~GIX$1miQ_zwH z2?N4s00J8f0162Z`bD_{7x#l{gK`J|XhxeBMOfeUXSoB8OAmQX*`{UG350k2XL8* zfICM}CHQ7UceB;u&VS0ttFH4=aCU~_trOM$HT$utJWdz%1I6@wNf#(o8J_14wl|T8 zMwTFW8o%I%*Deo8*+I8;l?ojDNutEq;rwFN*(LCd{TGJ_d=23`opJ@&P;04TK_g77 z;VwgS1+C3ly;s5X>v%ztH)D^O^ATA5>;{|doj1p4-O6&75F{=UrKtoc|EK5p#nh7F Z(3M22{P|aP^EULU0-=VPe2>~RwL8XyJ%0cI diff --git a/src/tests/data/keyrings/7/secring.gpg b/src/tests/data/keyrings/7/secring.gpg index 7d7c6bb15a68b8e20d6d6239810c15affab87118..e7d94e9e956ec5093e5c0a22c1df78a5ff6d27cb 100644 GIT binary patch delta 2516 zcmV;_2`l#b6YUd!#lqMGW?mK~0SExfz@#-s$(;+Eqz7psglx%>BAxdwPDQ&d(xitG zZ6NZg<)`6NdT8hT36u)kXPO}Eo{!`N?HRgjFUAv%U!~>U7{{2}5 z)vfR+G9(m*TH+`*;Ds;(Kw+fq`JJ(SxDe4Exfh0GYv`(fm$scSv@r~`YNq)V*yc&)&bpcOLlQFnh;px<= znwP8$Q99Eon@<|Q#vIxwDrd=D1-!m5ZLJ5a8$Pus)Xn5=5O zmW|yp>Ts*!3+GFmdQLi2>sy_rxHZwQX7+sMTSv|;q^hr4Wg=Y?cIQn_uVZ;`G9uC4 zpl+{!X^MKU*Z9t7e4$xVbm1Us=4>Dk5&11pVSa~wRv*EJV)7eaT^=yi1ZY_ZytA8u`1lE zRWI#{(`Cm-5HH7=yy=PsE5I3}PpYPb07|@nx&bJYF|v_%H+Qj1vAXI)wV}Z#sSOcpM;z_Q5 zU-cAfl_#DMJUy3=z;sP^9YyP*UtkWv!7_#r8w33kr$|F4sW>Z_cX3=;;Bz$R_zBqT z?=(LKgi^P>*0-AqcgB%kHD{VqlK-{9mT@8et=VdP8nPk8723kbt7O+Sp}D~SQtUzp zwo1Gi^=COT8TfwXh7d-Zz0#AN$Q)`SUZ6q>CvI%|g?NH;Lb5Q|(c+iIYw}2b9Zl2V z;d8aKOnj4@12%t$1QP)Q05KLJ1bRKhMFm2>7#%u(2nYEL$?6A9Qw0KMUKS(*8v_Ij z2?z%T6$l9m3k4Pe0|5X43JDMg`3%YG2TfBz)d&A~A{6qJga_i2-Ij+K+5rF)xGlx{U~lCt@n{0xa!sh*k}56;rmDTYx*F(XEjrR9{L30Swh@Tp9LdY!ZuQ!wJjIoGSfp(=6ye&AnJqM1s>@;mmpNS@mPXd zQE}DTnJ6;9`KCdF7cH{-H5Zx_Pb6YPd3E&fPS<9+KNx-s6jNrlY*qt#5w+5Sj2sd? z%swaf*I>#Q|Rqs8BgH z8xid*HcH^L;*fmSi?JI>K2(`Uu&03pdSd#=@p^v{fH$8+U4PR}DZDN;y&`+;fM6%$ z{DCt1#NTRGooq{$Em)be+C|6I}&G`1A z$kI2Edp&qYxgSNDCPm_f--j1Tg9gD?gp(Ze^t>&$fa?+m$y=ldMa)2}8PTLCe*3LG zN0fhZ^n0!l6IGEQOl~9}hA4Y4(?VXDCPTV0ay@Kju}fqOVty}l?Y)l8I^v4_9N-bc zMAerf6MKgzsGF>!1X-7gY(xA!^WP&I7g9CoRe^U?$$D&q6|n#j0RRC22mU4>ht0|L z@C3vH$yN}uw_9!G}UUTE71yG zDT1?bo-ZO6B$%1FA7*nig)3J8RDKd*J_JG#SBfW0T?r-IsB8%gB?%ZYs}N<8qLhD8 z94+YCOsW<8FjP}VspM1u65Rad9NzA?bR%vd?U(5YYaue;=3GuQlDd7|59X$Ari}v2 zrfE-8JGU`r->sW>L)t*vci!rYzy*`LRutP+_h?gh@Z$X6;+)qqR`(C{^2}^_4nLXluu# zlWn~!!O#RoEm9-J61iN^{x`Ul|IY3z1p;PX79|233;+rV5C{1T$?6A9QXL-SmJP7~t$#^-9e%N%-Vby80VKc-UGswBVEzN!n`ms3IasEX=_aD5f*74)N$TkWWyioI0~gZbnXVt62exkj delta 2528 zcmajfc{~#g1Hkc_VKcWFk(-ca%q?;}6uHAQRD`gWBV)G0G`Gr-BWEQ-LYSO$Ylz&2 zNr+sJl|LW#IOBZY5BtE7wy~O?+K@qcxS?k z8^Mjur zE`4%H%%5)}iC-C2(2gnMwHKx-Qxk6^emRq*AB$6p7DZ#a3UC=E?0ktadf3&L-1x=C~Ls!<8W$h%^i<&B8TUcGCC9m(j$Fmu97{UROvD~9hi#3)=am) z#%LYe;R}O!dBi&D9NQdDe!<-Js?3G-^9^U@;k1C)iah#51WE{QgEvTz*dJLYaadj% z`^sIB4+jb%mJ-T}7f8_#QR{mCY$9HQw>#A+O7Pl-10xDEl4sS^lK4GkcOugKnJsB@ z6-JOs{dl1|MVNO8FrjU_(pv7EEo(mOx}hh@GoCxUs%Z>7RYmVZ{Q@y34Xdv$dl*$p zEEUNKs^MV1B7-tkK^oERD)QW*+H@4N)SpVbjXE0^g=1*OvH0*fiprIvy`$@wmC2lK7EAo2V*;6sOhK4N}1thEb z=LwX?cIx1mtfPl0kM4?z9kyP0AXF}I&jDR*JN*0^@`?qW`iWSiTjJvM22y3xrdw_+ zLztbrd(!U4PNQuyK!8KP>y@cknl*{PL9Irg^DBLm^#0=B$Yx&2k&1;b4t-%eV-JQq zXz4q^pqeoDj}ed?=2beQ9DH}yCLyd5 zEZkv#{K!~7AtGzb35I!Ie*RK!cq{!(6R$HVo;0lS8*IEXFdGC&0MVNI2B!8%UQ;2r zDhXJs2(n6gG7J4_ro4ekHcEgSDZnGK+wcf(`zViH+S03ih90JqK&rTWE5VyQ?54(g z^{OkSQe#DYud=XHHo{B*RrC2d=02kNDM<+)a^b5~=H`ZmrO7~`evhu46!5z`j_isy z_OH-Lj!_cRJpqqs?>)WrmbgLSVn#xodX z8{-X;6LNXw%#O)mRdRPev?Zy|YVERUxj| z@*VpXzl`8#p-8*N9NhuFf_Bi>?Pv+`3E*_*rULE1?0v8l^&AOiGa`g4C1;Kn9*y*# zP&qjbgI(M(CJO4l#*ZV&^F*gubK1ypwc0Wv-C&x_4olEYa9ho+VKSGhT1P0b2@DU9vE9CbEbqfa|T zM2+h7jDDfxhm9hvd|9kJGG&zK>V&aIQAtNbEB|Ki5LC-dKWq{bJ7D%aUp+S>pt2$& zosc#QkDVkweA3}6;Cf^7nyZ_&7rr5Tp3*r=sZtJmzOfX%J0ecE)*Vr~)8s*z=4x`D z)XMl40F3)E8UT*+NYu|bmdl6bn9WmhX+100omMyjkyle{wP>C!cuwT4!;HGQ9oQpYHkC#cd6^lqb4d`#6bjmw^DIDSKR7ysbm&zSGh7Ou@e=d!3&qBAOGlsNvypPCNY|F%YW-(IcziA7j6Rs=YL72)v?F4o zfcrl+I)_b*=Ybm5l*Gjj2@?+tQ{CEZT2@R%^^X_KCz4+mZhF)!W<=(vf+u0=b;NhO z?X%U9a<{ab(>^vXb1ZCvdcFs{r% z$A&f7!TYJ9@Ox;L7hpL8by?~1oZk31w9eVMN>#lb_bK*5_g5|<^KzQRr z)ny5ezB>ui+`k9R;EVYoy9M|ClTh~KFPGwP@SO>de(M4A&~Vde=B*kSQo^sTx|3BF zcBR;e0h#d;x>syu_r3lIsUDmA+}mARzHJ+Ti0fn+6gs-$=eI( zEpdO)OpY^6m%yKGnT?^txvx$d)&{4siyoTgcTUV5xsOfC{(N!_iv@>r>X^ve0cX zCGLjO7Nv7=V=PNqzZ3P(ww*P+VX~$N`T4dQFY4$o*6j6MO`7+Y-oSJoIB#JINdB~F hX}@bUWo|I-k9S80e+F-B?34gs#bkz(r_^e6{{|c%xsd<>