From fd753b2e3a1943c195a45da96fd81bc0ea643cbc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 31 Oct 2018 11:43:00 -0700 Subject: [PATCH] Handle split of 'download' and 'apply' phases in gnome-software GNOME Software 3.30.5 split the offline update process into two separate 'download' and 'apply' phases. So we need to handle clicking 'download' before 'apply', if that happens. Signed-off-by: Adam Williamson --- ...p_package_tool_update_download-20181031.json | 16 ++++++++++++++++ ...op_package_tool_update_download-20181031.png | Bin 0 -> 20576 bytes tests/desktop_update_graphical.pm | 15 +++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 needles/gnome/desktop_package_tool_update_download-20181031.json create mode 100644 needles/gnome/desktop_package_tool_update_download-20181031.png diff --git a/needles/gnome/desktop_package_tool_update_download-20181031.json b/needles/gnome/desktop_package_tool_update_download-20181031.json new file mode 100644 index 00000000..904a657d --- /dev/null +++ b/needles/gnome/desktop_package_tool_update_download-20181031.json @@ -0,0 +1,16 @@ +{ + "properties": [], + "area": [ + { + "xpos": 823, + "height": 17, + "width": 68, + "type": "match", + "ypos": 114 + } + ], + "tags": [ + "DESKTOP-gnome", + "desktop_package_tool_update_download" + ] +} \ No newline at end of file diff --git a/needles/gnome/desktop_package_tool_update_download-20181031.png b/needles/gnome/desktop_package_tool_update_download-20181031.png new file mode 100644 index 0000000000000000000000000000000000000000..d926a9219f7183148e99f5b3011e7fb24ad61eb2 GIT binary patch literal 20576 zcmd_S2UJwqwl2KEM!P{pTO^1CBa$UZPAZB>C=mh43IdWP=PGOyQIf~p?(Or&Ki+ubJ;ta(QMLBoYt1#+4Bz}FfmbwD_Rt@q zM-XI>>Lul?2=WuW-GTf}3%|~E{bqn5S9nyF&tCKFnd$$f;)~0+;J6jzCjV=x}l{V_h} z#hbqJNnxDhzVoZTt*gHHai5lPx1ykf2loGWKfGDp=*?NjiiJ9w9Xpri2l3WzX-*vy z)Jr1z($!*xS`{f3vsZ5adT+bPzIU!rXtt-Y{Odz@JL+vC1hESgNiSEy^h9@q?tF{l zZcA)vxo4o8YPLPD%WFK*quU}j8?!o7K3^r`IxxZ3;j>VoN!ccA^S@pl@Tu2-gbN4= z_@Jwc?3I~Fflq|nYF_DNUfd-$^ZLDn+1)RhdR!8A*XIW+#hCqz2hp-8lbjoP>HIc1 zU7AD)mnH3cTr0(R3QvBCBF?1XCIX4U>QPBJ#t4&}3!l%Pv*g^`6gX2!tym;=Mx z31@6$1oZRO<3*h|s&_Cpk!j7hR^IO7s`;E#K36tU+t>bXcxJiNlq(&?SXIyI!}Kwf z-IlHOC*yK=KVl${nK7f{*0();2z$bBVpAF`+TzL1qYW?S4C7nIT)Qh*2V}Q5Hl}ma z8;E;lXI>8w50VU)rx45(xs4HLD4*FYcFUnZr}I3Bl*txb~TNPre9K*tp$k z?9o3#yN@Ak*CK|pIY`Ldq-=EJ%^u3QP1Q`EXOtJ$#D9CoK)~7eya_B|G4Z@P^_4$n zu^3Ml947S^*<(XU+H~CcgXql{Nm6Fk3!PD#GKB4e5x*HB`Bm?*>LE`lfjmj9!`q%q z!H-6zw8~s3`-E3|Y;!{&$ZgIPWP~~2G9tuvWoV~M`M^H0d<->wbuDA0a&qLw^URzw zzU6cdkG_R8tb_M-cJZ^fHG*=a567ZJY$H!yCD<+aMpZmsp32OvTWT-((C;zGVHKvh zz1F^aQkb*bZ?%6OPN?Tzb~(>)I~e7{Uujt3oGuE;B`FM}IAmM{(leXUxeXH1#w%Us zVWIdc@=9-pUZ?2EqTXi7!NZtPo3%cdRt`9m@eV#DK7%xkg$DlIn#o&Z#M)p+b_s!^ zCeQ~qD|7XI<`25)wB)E~YccH5nO7e319=5k=W#U_j(GA)ng+J6E=0P`t|>%yfY>U* zHvh}f{6MdTS{ChHo?v%|T@ObuIFdJ(gR?hXH4YCa%6e#0F0r;z_4&Z&>ipmfwODmJ zZcaP%%T3|9&__h6%_gx{Cd1WVI!7#CjiAzT&X;lagH?W0G!iYATN~P--E|>sQ5Dwl zdB`mRc2J>EeBHgsME;{*#yceDJ%!`f-Z2PoErel0oG_ye(dJStJemsYBYnaWY#(&8 zu8Ry0`^t%?w=fwFhk2t+w z>gAd&C~>v!qAns(Yxg1X+u_zfCHMKaj~kh{c+v*%eUfm5Tx%}Cj^%w=1O{>bd6>eX zf?E2TC3xfASK{Qixf1%xzQD4X=p`a-GrIGjf64RR95UiwndD^3metbT5R4y*z%z_; z;<*huO ztbKdW$S6G$9!IJTZb{D(RwGXz>05< zxCKcWgL;P~pAF(E9m$iIW)Gt*AU>_~tErrW#HX^H36Z&vEcg&DF(QgE&gob>%Iu@7 zOm9sSaJR3h*MWU_TN@>RhSM|ZK&h!6=?Ee6gxZ++doU-=Vj-*|Mss zrkjMIOzta8q}&T4&tI4uPx29JOJ6KN-#KySw?U6VKl4;hmcX`09PZbf+!vcASvK*x z3+bhvB%CXp_7iR89`l@P{3aEiq=jzJcfD50eiHL!>*owgd2WL^O_RH7zoH0)sS~}~ z=Jk&WhUW;f$|6UFSMa%el-WMGYu8wY6=-o1U1vz1w2!fv)qaoq?w9fl>FTCEYGbI- z-9%SALVJCub5C4pX)hZ&*ly)`Zat518GgCLkkIQ&*u1~M%Feidq4U^dsiVzru@%)^ zjIRmiYKPO~>6M1-Ld`F~f4E0XL2(b4LPb{@{db!ow0fT$f{HrIsb6C>Oubz<>jd_F8D4mpQp*Y zN>|}T_p$hIafX~|J@tvECrgbqIx%u#fNBR#H4OzcUh;73$7rM})DYsT`lrV%o2-KN?JYlpXD@mnV*cT5W+ z5uK(OdFF$w?^qAl_z%5^H3_$3#cygCPNcQj&)%kJCd#5VgjcR-A^OlaKCQwbdQaoO8+5?G1&7|)A z>UlhHEL`p(*n@)up1zM&;yiC;=oeTvbr;%pW=*pdgmTEPfSZK<;|gfJhCIvJnnYoO z(g`M&-nFKczi=P*(n3D_cKNs*^w&(3Il)B(=JzUTe~MJZW^EN1>b!8$Xydr}`3Lj| zMXNf?&T??K?lLE+HO7Cg^jU4ceB4oWyb3wqs+vb<{xjB_NU)%}RCRyf@Z>Sk<6e}T z<+DYZ5T-Q72o5XkM_I>LWfjpeC{6K-t-nOc)vH(pwSB@wDxSz~uD) zBWBn(#ffAHD_G%&W|wDKjov`8CPAcuWs@-pWA=D|;EsckGz zv!t8fPV%MU)*pvI>bqGRtOOB#$qS_W{W-?vT@TA=^40Rs%DB(4QaF9Tz0J^#srZRi zER`3LwpZWZeO1-OBTS{D-KDohcK$G9Gy&V6vEN;Dm*YBVG>YYRWPOb1;Sbjkv-o>E z_Z$*2Qzkjp7&?@mu#|#xqRp5}2n63N;&0-F#t)ptV#TpK_ES9FC)`${_wp2BnfhT~^k*i2oJ3lHUB+?6DDQ(u=j*tW2e_Gwds}Y;;$Eb9z6`nO?!DP1eh}g zt(uib_Psd09-Vad-p<<4ehh^iH3@dULnESMD`uf{Ba(|=Jux&hfM@vW`A2ok!3Q{G z-PN^`{QkJ3`E*fR?&vy?`%%f1%V^n~mAmF4sbgv7Ur5={_Qvu53DzQm;yHmgGH^vGklGZaTA%nnyNczfvUEwGrjN@FQX9 z-se;gvEpO!V32g$UZ7rdEA!IsdGm10`#qA!DU+L+0*Et0IpsI3sG02k?#l^v_|h53yd-`T!A<)*aoGSlWH{ zUtek+!+_41E^_B}UH3G4uz8p1?a1WY6JAePQ@VbB;FPP8tPpzcX2TOzNDmXmt)Gqm ztc4WaqG6R=BRf{Urbl0GDTEYQwoa|h6f6tb_?~+Z)sSpd zICmkGIMY|^LPRaIpHWz;$%jek8X;q?$sP^X>B-l>rcR2bS>ezf>nv3p8@Bo=egt~~ z3(1=iy7r>cosKMF;#r@{0{ezJth|q|94U-LvM7Mb-xe!TIc-X5kg`~c)5@c(!^jE6 zs>R89nKe<~;vc2QTYXM#J*koO5(zkktY1Tj-SVL*9$)Xd2X4a={85Wj9gyJtLYQ1q zyMt4U5JV;!L*G54_|sV7TuibHTD(RJJ4H1Wi#02g9IN7&U7zaSSuxn$%OQl{=m{+u zQk*XE2fQWn;JE9flxjrLBXA|-y(fC<@8$IZx4UE$^8B5K>gGH!I8 zhqI`qDy3!f-cAgplEKWvoTu*$#g8X(9T0xm$<2#c$L#xkOE%6we_c|(?#HOukv4ih zI|n~G7Sh%kdT8*2ci9zwDWB|qZ9I#AXpd<#*X=Jh-vtw#{?K!TOA>ALw%eAzy6&L= z%DtE-%1Z2Z6dJUEUXv!^QSilBlcGCc-;K<~1~Z>2B{syxVd#c39&-$D*d%+rCDsC5 zqK~WSK9tTZXyUrjJ)SnO2d*vZpgrxgk`;x@mY%uyb$*%a%2;ZHn5DWNLc$|PS8~r{ zi)MxFKEAel5!G7y+JQo|BXZKQa#3@Occsy~u+^c|;p1S1MdMYAh6kTV`Q&=iG(y_3 zgBT2mSRv2sMO&*vy6x)RbibdeuZS4))yj^^=*;AvnIxYy6h+Pr6=0%8UJ}!M<=voB z+@FJ_(pP)AO%*~usd+EBK}TkN%X`njG{r%*^^LXmoNYJhi9xzv*45b!tb;0jH6&Vd zRjUJSHl2^evxAuJEw79~(0|J`t;L=V1X=c#uO7>KU%LD44DpN=i3d)}W~ zxY(MN&QJ&%)N#-UPR zF|)FWBuwv1rzD5u+;c`1zpf$TNspY(w)*6du*B{5HVz`+PDZvTeC+IchylKM?W+e% zD0Z=cmiuZ7y;8`AZL$aYGfhjbo}y;E%rtJDfqBG~=9J6T(UK19WK^S+$n+`=6B3bK z2=VK;7EC`okJ%}<_Ytr}4Vtc_bVFY{ePEZ~tuKxX8Z234h>l(iIlTWdzajeb2th>T zkipiO`1KqgY_ac49UE!2STqMqJS0+jrh=s@==XENc%0?xg@^!)mLxIRn9>_>w=iLc zwT7E|MEvSPCPn5B%c8g5m88)v#`-Qt(}w3Ea%~yfQ#uq-HuThFI*-PNKv9>^j)Bd2 z7GIaOpRb5NYR4jM3`)C~%vF5FSDuf|^i~c^zv!5BI=YiA;y3c>nB=er0_*ur7l{!z zO`1Z!zUi@QO_UTq=`con+Nxy+_e8PuveCj5UTslLqe2^tlYg&UL%}yq*P}95AO-|5 z`QhWlB!1JUArn2xr?rgp0A_*)@^mb2B)=Yy4t_m z(d&32_+{JBGdqUr@Tcd|!mPvfmgNeL_{Ejb;(f4bw8ol$>Wm;#@ak06SnS{vmdHTuSY4U>w0FV>1POxJXlp|2jc z?@ilw9V;Ej19pDkr0=hWS)CME}zSrq! zOI?k3s1O8ORF?*b$N_#`Z_H3i$boX#*+V-TSShuWC-scj?zOXuTFPW2BPg0RJEB!$ zxohBA3V0XuRMs7<@up4cLY{Tf<9=I&dhK-0KoM^_T@T-t?q3clgr0bkYji>fk^?`N zu_iQW@-a`c!EmBNrBw?~Xa_wVWynF!Od8GL&F$^GT+!J7cgKjlXjPHCmze9pQdY#J*SaqTxy zx++k3%?^3Vrm7V5y)3RBFWbI711u-K)Gp}vsJ5Br>J7KajzWWGgT?Vyu+Vi+>Z1iI z7jq?tU6b8%g$C~|HpgqS*w9(!76M>;3L#9MLWJF?lQy)O{LfOeHTjJo+uUFgV&Fl| zAd!iWU*8Y!m)$<(V&whhiv_<<)o8LuQ=;s6DNEV49Fyl}Uu-%DT^AuR*nSr*e3F4+ zy((x@QPQ^93Tom-$PIQ!KUEW@JiA~z&`aFDeyuPeUH)^LM$>8UrU`Jhq&LWY5%Y_t z9>bwJHtktgUfA5LW5F-47-lHe*5Rkhrk`FqXUi2ts# z)WhC_i>RCFE`SmMHmBdz=8jX8r)#iP1O#;3U?~KR%fz>zZ0G+{U&_=?8;;$PTD?JP z9HcNrW-mKwiaP2qVOos$+Dm^*ogz3&x+&+T23`&RMt9D%ZxR&gHf!>&=YlcvT0M;a5 z>FH_w=JqE*KVQ#<1|$zFlb*aDU^w}E6f6|BpMI}TcKF;GIwhKYT8KmzqMp3%mE`iVn0NnZ8;oN!Hy-`Yx@%-*p7j76Ll!gx@6U|EW2 zPkWJ4*i1hAbDb{Z(7YU%f z!cAYDs+v5?`}+oV?qcy;@U%F_R99*F#I%H!HGuZ@C_{Bk;DLWJ<=?YM|2?M=YHAEM z2*u5rHaTiBVkaZ#1e*K8>F<&4}Z@aXvvHZkva z_fZmmq}BhF=)Nr57rIR?p?c-ty?Y8Ve1ix8Sl0FW2vmdY2CJGaJ4+YEoN)CzC0v*G zt0!?9jYL%W4d(5qPdtS%F$4A(@(KU_!V&~(&rp5tI0OkQ^@rwr-XD>jk8GWyf*D6I zoUD!cKIT${YF@lp`VIuSpe%xC-UYu^@=mBRQ$M&*t>;s#{3-DI%WqD>Sbyr3fAviY z!o8!gH>#lwK)(lMb>2+zHQ$7H z-W6dAp?OMs<^FDViR11SJE)6Iy=_SvQ5E67h6IIk%9||r;9>Zs2#wuz=1Ktg91+I% zHIq%K15fenyiZkXsyyI#%I`vh-;j_WJ$hA{G(A-qw!~_fGnx5F0-f}mz>3yPMwjW2 zp&#ma>YniQE$IdqkI6}U{z9ie^Snzt4^IUdsPc{oMU|%I4t%t)^Wv~f8gQ4P4qz{9 z4IsaOC(!%DwCsHM+HY-@a#*(8Y)aD&!nm64s}P-j-!+L01h-N%&cyuZ1JjuO6HvaI zH=q7_y$#LFg|+`OM4O9(dv^|C2}q6s9%`q(QrRp{&j6ExJQL6)ZH8)I`!ucVFbAb0 z{D{kVi}C9lcOMzRjDOQXII%I5%cjf3vpPa*hjpjZo(uV=Y;lkmH!d^g`l)mq4h$@f zUh}!-oaH{csWMJ+*G8E9n{^R@DzD98sO46Ey&Sn4)&9+!Yx#h=LzOi4l$IGl%~+>A ztWz^)V=|o!z4jGqWsT#FK_G%|+AD$=->m1nm*q*2v(KG~S@$?|fRdnJ!zGi5dn){iYka9(5aP}q_Edj9}%2`B}t0Pow^)yJN(?Wl=t zj1|U1ZL-+}k!Vcd2{r(HOTknZmfy(i|0+zg5re8+Tu{*-OX@~%=%ZRn$~JK0@ zQna(LI|HT()Q{PpFHF4|?oVELl-%4PH9BX)0M5o|4)49?ae11z-elq3&GbRRi8CG@s5h<-n2{pg-go6xy_P%1w)kp`T2IpWhqk1?Ut8h%_AD6HjY{SrmaA zL)@7*Q2yZ!Nne;B4q*U&H9_QCvxh3p2XUu&EWye1@-otXGow%wAXTpqX02I|PCXsA zx@JSFCS>#AWzlExU%Bc7gQ*aDd(}b{SNgiS@m`w1 zn$u{mZF;kz_g6uCeh~Et<)FWKWA1=ukJ`QTCW__yt1q_W=)##aUEyoDw+BaK%VxT* z23U*MHlr1DuJ>DwyykqgRdBdIY|s*GzgJ;x zh}GWIqu)&=VQ}e8t9v}$P8zDcksgdag|;l(%z_3?w(Kl{kp)z~QL>EdMEGojRb>`f zyCZx^v>^&~Foz$BKUpPuYbr$qpZs#^W6j>&3Q4!G`N5`fI+SkVZF%w|X$HKIkKthX zK-}j0{L#^Q&O?jh=#qIzyabF$8tXoaAqBDWpRES;6puFs(w;`wb;jbQHfMOODx@7I zI|sL~OjbpR$kSIR8rP@kqqim}pPKe>^;9g%GF-FCH( z?RHCwUvJ?VtV=6T>F4?VNO7a8e!`_f35LKh;J2|9SkP(Yq9JM(FKS`7RN=c$qE>Fx z0C|y)&-PjzV>dwD``tR@#jH+Rxs=7|nRuN@Q+XRF={PWEu!xI^A2XK|vuyg%SfuK>0czEvX=% z>W#JL*CqFSdpaPJH=B7riA`LxrK2hrh4Wi!{@Sk?hi&4bOQ~%%k7`R-*j|S~O*eNo z?(#IfQbCS+n}DLG-tF~;yv_<==dOohs zR}m7XoEP~H=R%@n4HO7mmrJX>cJdqR{xY{bfpwr^0j29O4;-85rVgl$>=8uR6a}N& z3TwhQhVC(Hw!{b-mjTlRTQw#vC^pTFh8iRg0UVkt+B9WrlN(}%lV=+MGCq3sB}26; zBdEme;I`+8Re`9+Oozu(FBf`0&s6c|M69Wvp3NEQ<#Y^2CbPdcxhC*zvXI?oLwFFQ z=GJW@OQ=liA<>&RgIjhq6thZ>2Ge!ACPy{NIn~Y6al3Vo^6MFYzG;M8t3)cKB$`S5 za;KlVCSv55NC9^bFo$8u!=z~Z8{g$sh7Mav_vNWG(FPiqEpt9^tkT{=_o9B6f>M(2 zPp9hUoHhtN$?Dtf-?>0w88kkGLk(MDu}MsXe0LY;ha#l?rIz_UdL_-yUojhCsCIn|ABXn1ST0X%&;4;}Z;DkpES zA>b;LuUdsk5d%!o>nDaUK&W}R&D^)bvN@r>aaIed+TNHRiC(+)(vQ5{Ii7}$xC-Wd zYu9s}FPqMZ8wWDq;CD%Ud8HHF21#`D+Rk$%=6X0v;Z?}3vOny^K|>7!D8(T~=XY83 zjOwQbNo@z_4{fjVmr0aPPdZ`@bQTwY&;@Zv)k^W;)YjtU0qh<@kHIdy@m4$05nZwH zrF0=(yVH+;VneroaO;jHPJWXx*@!mr+8oYZJtQw&`0W(3S}7;tCPA+hwHKe9s4$<| zo5Z2J@RT4eNJ$vy5!&>sRm|~vVHCXZ!okyJrY2qsA^vuTGr7oe)^SgQo7~gxaA(0f z4v*UTV~-Y-*QEY1xnFXTFHn4H8Gw2sp}P&GDBqIgNemP@Ak%2)S@xQX(d#0;L=nLRK)iepYWsk;HnQ%)46L1-*jcsxX?UuSY?q8OD_TtYQ&u`OtkTZ6Nb;Q{ z9%8Y=rT}LbQ6;hH3XF3EbQ-mdOJKCzkpB*5f$QHOE;7cD zmx0QllI4PX2~?8=+VIKzBuxmC_8s(hX4GuJwC>)VAGhq>Ug_;~)ZG)eMW#ccfZil&LE&`7KgQH)qgMYInID)> zR{Dp?Tm{o%z+VNMup67f^< z?scDnPfWJ}bwJhrU7DeQ&oWuOF^+yQRn#@!Zpi!Lab_p+>Gb-xZ~XX@2M3Pc>g^i{p=^e|fop$}<6CvZCU3Wo>RQcSP z7C^uh-^mjIUthRGhx#!{5}=K5V7b#3wxUF+0rvM5lk%%{GV* z*#u-PK0!>Ed)4tQHJ|@}CSI#%0Ex7SYdG-a#{#QX)_k6V<|KJpbDissX1|D8wWte~ zgYTnqNJ=op{qBu2RzMQu82Cd1;V8NkxZJvK0SLc7Q71KkE2Rf%h#7mF&6ih|n{(w( z3)e3tbPsq>3qC5QK9m}_YtvjWb+)Ku92s$em{Kp9LM2FmCj0x6**-qp!|sql`w^T> zebJ8#Y-v2fcotuyndmPsHaGmS-a;hHppdUOcYMt4a*P1v0hj-F$tvZiJ_u1l*=u6; zV?)dBfZxc`^<&@Y=#`Qc{3OhNGR?U90xBj809U`#&F;BqRN**Swbzb1AF4^Br5ge& zTeo?byu|G_6Id7cqZ2HqRlZ)$31=iHh}1<-DYE@g|B0B^)z>FA5=PK#CYid~>Rf|i z1tKD=Y5|!p*Mff+cr`OWGGDdnAXGmGDRa|GV>zTMYCuMIDGe`?Q7Qam#dh)3()7&K zmrTco3CwxfYE_;@alZ}MU4JK%wb|l9;EKO#6e1u$1<;gObFP&D)~$YUIQxuOnJM$DWHoL039CAZo`}V#_rt~0I;@7onU6Q z?SeyNlmkS64zq14&9zxhk-XFfhmY!_?7QoqlvqRaz|=*fZ*k_2y&#ryQKUeth8flu z=-Gzf>gp<|>)0Jb$Y|(k&`gr^vh_>44u{F%aoYiu+yWeqR+-9k59om|hw7-rIe81^ znza?w&P%ZSWr~@+zI0-6j{SFh$xfXpU3fW~uar`ow1mVm#nDjn>9|jRe})U<{=8zjy|b1q2!OS}GjNkTCHq3K*BYfnF6Vm;rH)UY=QP zDxy4E0wBd+`K6Dy&uE=9cyl`s%vt+{BH_rR!;uE(cB57YF_h~c{scdO9c==3_SX}a z58tV#`BWn@k4cQlLuvwE>tyP}$qSv90qYE1IT7k%oXb=mWGJ~Ud7H`D0T9dhhY$1K z0oe(q8OA1dQsTxdn*p~@V<0$w!4|!}K7MN( zc-{3f%4f)prrXXy3$)~TUF0~ZP&5l2B8T{;-DkSm(XH;*A{e_e*sS_3AhTCYy~-@o zkDV>*6)GCXbol)=2Wiq8Fm?`=Z)O#=Tz1gwU^uC5*0Lt)K!qn1w%3NC+i82&5yP*a zKO#MjJ0L5>TUOlXtkzfV-ea9kC1l5hJ2kuDZ@QF8cb}YQ4sJ|yu!IssTkaQX-_z13 zmHOrocI<|HPKn|h+fE@{noAn3t_K0Gtym)lYX{r6r8UP}CB^4a949OZlMYd1y6N2x z-3}wTxjcOja$WzFI#xt-HCcT1Tb6C~tg$5L6QRnb&+YVbTi@R2VcNL3OZ79wSz60B zMeScKbGCo?%U)1JWvrhEHfOEGX(}-`&D2NW*7;mX-7~sUtB!QaHv`mQYXsYtJddhh zoE4c1J8}Ux0LMK+!v2uojbVDF<4NCyD!#n~%~a6jITi@R6yCW4i4u6@MXEH{-`v(R z(hH%sEqw3as@cmSQ`7VZ z9x7Hq|1*RrUB^UTCd&J`?@k!rY2s9SkU(pmBJKHY2;eHw6~{iwtLLZo^t_ht$7K<$ zgDt#&k!UukO>`&L1Uj8JlLDKtd6NJ20L1frkTE5)8m3oOx^f1LTX5$GyrTr33*W2V0%xZ{>_4lk;4q@@42>L@8{o_$-$qD&75dUM>Uz| znpCQ{fxN%Op#d{Efm%7pckRPk^gRHJ>~GUR27N5js+-DePnM$MCPd}kw2{KgMYlg4 zomTO;Y>JCG)Is5CRPm3D#=}v(I&V-D6UMX2nqRYY>Y#q7m@vK4l-LnP%9cx3HAH0Q z^|N4@Kb;pfzEeqe1A6Ed`V^sI?bZfFL{Sk&A-@ol!ppwqO+FhqP8Li{FO6r@6E4E+ z_D%x88W#hMv36~gh0(b>+I^YDfYVT$S_s{z9*NWi9l2J-(&YJtu!~?Oh4sday?p+- zp{z(GQmwKladQuLZ0uIAXF!9xjPpy0f9j7 zeaz0u$UVszzMP{YB%IXa7hm+*o6+WbH1wMxBGD;R^9-uFH7Q5N!tT1IO@i}NRu7AC zuxS8h^E1Zdl=-s|iWI<>*|ZuU;QV8l{8?*`x8VV&kfK`XxDEnCFnmivl9o1jB4bT^UdZM zltOkEfoEu^)8-n3&Is4O1AEs^SHOg)I@A_rgF`SX0uPWOY(FkeA7%u8oNC`R)izP? z$xf};k&~J@FeI{;TL;rX{B~4*)BG8cJHr*jV`b3-f zF!j)lIZ3+&Y}6TP`#k8xinTo`CT`ndcZ^;s6~YmZJ|`7ifcfz@o|_V`1tYG-s+dfd z9tY`upEiIT%hBL%H36+B^Yr?7c1&8&l`XuEnW+J&E(gNd$$2fXczs-^gt^8y(H%Zl zf~lb?Q(qWjQT|4Jkp9CY%8R@|1>8=piw^i??OgL0NgU?Z`j1*Z@kh=dw%QPE!EZ0; zijW_1p)Y9!ju*s{AYQt~hYb3y8sh{ZRe+|VgFKwjKm$`xQh?yOSJa|mX|`ALqJ%ZQ z63OzM90v6v{MOK~hAApxoFY8|I-%?(UV|4=+6d8FHtCZ}=%It>UuG$`CS)MW=?&tz zjgctS_P0lhsqUsW$63ttr6M-&JEhe)Cx}}|`qE4L(Ud?xD7E2ITusdsF%z>aGqy@} z(}ljRPD4a=kLs@7tl_(((SUKi-zzJSV>a>eDVVh^2&^=Z^^3Dhkn0Ge%#BjCjbwu} zaJHzZuO70oG#OQK!xubd{cWk?Df{2u%eLEDF-uzBc5WOKM6|SsmldHaNt|v7 zj2Rke17ds9(ZInzrATc+5q}qO00QU_8`GI=Vot=GIO)3J_??HLDblm+pW;51tAFA@U~PX9I}(G z>I;q})1R(E1z{(Vpy$a2{mJSK@d|$4`A$S#fUTrOFgQ&=9Z7uxtKb>CuG0o@!MjRY zG(3sp)Q;SH1v>ty;V3Tx-Q*XYL#e0zbNN+hJkxs$kw3xFLit&7&6APhGgS4j2x30= zlr^jGcRbNbE~EYcMo4jAAyl$S8$>`BPMg<-u;P~I`ek|bz$=F?tM^>93mWNVig-iYSgWP7i@(6{>pMsn&hA=)ea+~;gF4oe z3}>4x^bBRLLPzTiI5gODY5OjmLkk3}9$$3yEQ~U7MP1NE&ZXfDRwu7|$#xl%4|xal zOd=GoW}&qOWdb>tb8`tbt?)cZcoHmJC1v>%vi&sKu8VdtxH*YQFnqm&y`i`^c?kea z$=L%FwBdg`A8}|XHmeO{!|Xi;Ji3I!hS7!S9zRe3OsEv(vk{Zk6X zZcW8cVi@xiRM$*Z)X*1>C)qug9*cu4=V($;q+)H9-|pwbC~6`s_o?pn&;u5e4=WU6 zqMVnrT*f?%4>!%{c3k1SerDT+$@pQRwMatKx}T zRw#OkJ&|6nv0<3l=HBRjY}_?W!xWL2&~-EdbeJ>AE!(+lI&DBLq&6*WWDHR)&@Gj# zx>_zgtlMC1Ra>*zsyG;~`5os{qPfJ`E$cSL)cPCUQ)K2%n`X9Qam$8vKW()7AWis| zy2JMHt86JP4h9lMfc<rvcOmyZZKR5UTD=NB9Qv!(++yVSejg}xF zLEn+bG%AE-Lj|^4X|Dj%Ax?Sznu@_tr^}fJRlZu1Jl%TioZr*a&t6ba&8csKDPgXt#s0UTj_OV={*;i>2CK21f*2O?EeSIm2!5+ z-w-R)@2D6w9|O*HO6yq-2zKV%k4O0OA<&Dbn?SQMS3W-gxdhNyi(%&MG9|h23y&s4 zYfQL!K_w{GUdJDgPp7>C-(=k*0cD^Rl5csR6`)t^i1tDT1ZYicU)Z+!KY)DT_N97r z4|QhhwSN5}qjjzCtZk?3cxrvK1aDaE(2W)thmv8FA5B1ffzXjDWkA!O{c>yTqt-RL zWZGYUh~?CG(_QC8p_1q<$6$|>d`Serp`f&L#8R{1C3Kcr+R?(ST<`x7PEtDb%89I* z0LJz^ataNUIP?;i+fmELQChvM>kDI8$G-zkQ@F?AKW3mz5hz3b@+k8Mes+TH27qb+ z)HGNx0baLG#l(z$Y$87|5<&eJ7w~UJ8e}#Go$5K#)#HiR5B@Rl>{p1gL9s((AwvC^ z2YavmA3?NY{fm#Nq3w5q)qj8GzZq7&bNbWpmxKH<<%85+VrmvJt*TH7>tymjdaLX8+bABC zb0-T3i8mo$&Wrf%>v`%I0Lg$=57|59N3Fv|9E~1rjIE!bG)ww4VI@^)P8l!@#3|Z! zQR!lS>!S_`!n9vxi(SF@QUnK?W%7R)2@d(|6uT4{`<;*XS1ERX^6~z>@~^)6^UA;c z=6``OSOhZuzho)@G54_x{&&(}-Hbmun16XQ{*>zf!mj+sOZh`7|D)CXIl;gB=0CbS zb@2ZdS^dAO!QaLEf1q|z=T%Ly#Xk;3exl+2dBv3d>At{yA1)~|hVlHD(9TL@!S6gpl;#| literal 0 HcmV?d00001 diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 120d02d9..2c843140 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -52,10 +52,21 @@ sub run { # will retry a max of two times if we hit refresh and wind up # being told the system is up to date. my $retries = 2; + my $dlhit = 0; for (my $n = 1; $n < 6; $n++) { - if (check_screen ['desktop_package_tool_update_apply', 'desktop_package_tool_update_refresh'], 120) { + if (check_screen ['desktop_package_tool_update_download', 'desktop_package_tool_update_apply', 'desktop_package_tool_update_refresh'], 120) { # if we see 'apply', we're done here, quit out of the loop - last if (check_screen 'desktop_package_tool_update_apply', 1); + last if (match_has_tag 'desktop_package_tool_update_apply'); + # if we see 'download', we're in the GNOME Software 3.30.5+ + # two-step process - let's hit it, and go back to waiting + # for apply. If we hit it *twice*, that's unexpected, fail + if (match_has_tag 'desktop_package_tool_update_download') { + die "Update Download button showed up more than once!" if ($dlhit); + $dlhit = 1; + wait_screen_change { assert_and_click 'desktop_package_tool_update_download'; }; + $n = 1; + next; + } # otherwise, the refresh button came back - that's the bug if ($retries == 2) { # only record the soft fail on the *first* retry