From ed06502fb60ac9fe18db5f4bbda60c854c74d7b4 Mon Sep 17 00:00:00 2001
From: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Date: Fri, 29 Dec 2023 15:44:29 -0800
Subject: [PATCH] Fix flaky wizard screenshot test failure, and try to make
 screenshot tests run more consistently (#80631)

From https://github.com/tgstation/tgstation/pull/80542

Not exactly sure why this only fails once. My hint is that it happens
when the alternate tests are skipped from this:


![image](https://github.com/tgstation/tgstation/assets/35135081/67c261c0-e771-4696-add2-f41bb800ad65)

...though this should still be *consistent* at least.
---
 .github/workflows/ci_suite.yml                  |   2 +-
 .../screenshot_antag_icons_wizard.png           | Bin 789 -> 786 bytes
 .../screenshot_antag_icons_wizardmidround.png   | Bin 789 -> 786 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 5ae8b68ec0c..f422da88164 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -215,7 +215,7 @@ jobs:
       - run: echo Alternate tests passed.
 
   compare_screenshots:
-    if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) )
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') && (always() && (!failure() && !cancelled())) )
     needs: [run_all_tests, run_alternate_tests]
     name: Compare Screenshot Tests
     runs-on: ubuntu-22.04
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_wizard.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_wizard.png
index 8681ec75728a6d3f5c8dc8bf80845288ef06750b..69a856722fd67c54f5ce288628fbe55d24032ae9 100644
GIT binary patch
delta 621
zcmV-z0+Rie29gGlBwbWcOjJbx0009nZwyDB3qqACR+<M<z}Ei$`O(Gz0095s(f|Md
ziHV8fucq3bl9^^Ru&}VadvRtn06H52H8?@)zqD3bV~nQGUyj!C>K@wFG!r;+0y29H
zo>XX&gphx<Vha|ug<{|TJ-a(+nLyDoc<D^>?4OX^ehir$PGGTcxm>P$D;dfGe+_`+
z5=x<m+`R+(J|`QKbfD`Oc@}`NmO}xsg05pYAeON<$!<MTYLM~0JO`kI1kTu}$6A@>
z{vtWxX26iMfwC;yLMSrSPA@HtU!_Qf11{<f%JYAmfNc<JXv~YE=*I1KyJrNvLoCa(
z%nhP~B^t}#*s7{@HDMn(AWDMJZWA;#7hn%Xy3Pu4fDj2jpgagQ#s~Bb8H7|?4!d-~
zZ2+2oLdHnyx+VujZRQ8-`vutt#oWCE&P$mI0mvR32rXX_S*S6mL|>QFXck@zvHR_R
z1C)QcF@Y9<558?%cA#ic6ChRUjgFnUN8Y^yq5$&f07{^lNCyB50jjVGW)9E>z_UF<
z3<dCzD_g{(Gy2#<=jl7l0q2GJskt9yfZEa)x&!FTT5rsRw8a4zW#PWjw)%zyKqIXh
zdl?Xbz9a;p-fLmzfN;jZ8LtpPUxx_bmQa5S`Zz{Gh$)`~?gGFJ<<dOX5CB(wx@)x1
zsIfp_sS_e*6uoo#yaAe_HRzr?1apQ7ZIYEO3CC!7IX)UX;5vXYO0C#2$QX^BCB>nA
zytxCWhylL$-${Qz^b(aOB&2f%D9P*nAW|%%`-F7vVSpc=5w9lL<tifp0000<MNS1o
Hu0mjfVFMX(

delta 624
zcmV-$0+0QY29*YoBw$xiOjJbx0009nZwyDB3qqACR+<M<!1>X}00030;L#d`c!`OL
z;jgCJo|0$e@38p(u&}VadvQ}V1T{E8>c6yqPX$(5V~nQGW<UjBj@I$&9@^D36F6}K
zGJ7$UM)r|`kbk@uY|&bv*!O?V?#@{z(9{vEc1Aq=CzIQL88SJXz-;Dnxm>qa(w77N
z8vw^SltOn|y#u;FzcwamPuFkqBmlAIeF3n5u46c0C}U}o-7->Yka#W60catC6Z>>n
z3)2{P2aM;ep!Isafl#bbJG-@8$pN<lyg*r&5wHnD4S$VUp65S?!*~b1LIW9(4S0iC
z7DbU6L<LJU7LoZ@<~!3Rh664FIuP2ef+BNj5A`=04Nm|#K!^nIP!@z5;{*C)$PwC_
zy953Vp!o-6jHE0}a!{0Jez3kSq^hd@e&E_2aLHYn2?59+YX~i$5Lu`(r$k?y(`Xhp
zc;M<E9Dkt9jR~{>eDF=vumeSdngFR%Z*&~Zec<XHFbE)z7N7*0iF5$45TLR{@B{!I
z06g0h#83baxw1tpI-`#*+=uZe%mL?x`Kh@dg2CK2x&`RVT4#*nv;%Geuy9}NSbaeP
zppjO!y$lFIUlM{)|1LOXK)7Szj+YCduR{dzNPnmWeH^18#FWngHvwRVa%o;`2!N|T
z-PPJ?)L5Xe&<znY^7vjpQGjM>589^=!JJ`2hh$+}!Z8{i-<%zACBPVkcI*^nj9Si;
z;?RD$xdX<C0lxF!Nq;}|5|yeE@5+e+l;m}O5GfXoOy}+f_y%pxum>ml4y*tG002ov
KP6b4+LSTY}>J}XU

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_wizardmidround.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_wizardmidround.png
index 8681ec75728a6d3f5c8dc8bf80845288ef06750b..69a856722fd67c54f5ce288628fbe55d24032ae9 100644
GIT binary patch
delta 621
zcmV-z0+Rie29gGlBwbWcOjJbx0009nZwyDB3qqACR+<M<z}Ei$`O(Gz0095s(f|Md
ziHV8fucq3bl9^^Ru&}VadvRtn06H52H8?@)zqD3bV~nQGUyj!C>K@wFG!r;+0y29H
zo>XX&gphx<Vha|ug<{|TJ-a(+nLyDoc<D^>?4OX^ehir$PGGTcxm>P$D;dfGe+_`+
z5=x<m+`R+(J|`QKbfD`Oc@}`NmO}xsg05pYAeON<$!<MTYLM~0JO`kI1kTu}$6A@>
z{vtWxX26iMfwC;yLMSrSPA@HtU!_Qf11{<f%JYAmfNc<JXv~YE=*I1KyJrNvLoCa(
z%nhP~B^t}#*s7{@HDMn(AWDMJZWA;#7hn%Xy3Pu4fDj2jpgagQ#s~Bb8H7|?4!d-~
zZ2+2oLdHnyx+VujZRQ8-`vutt#oWCE&P$mI0mvR32rXX_S*S6mL|>QFXck@zvHR_R
z1C)QcF@Y9<558?%cA#ic6ChRUjgFnUN8Y^yq5$&f07{^lNCyB50jjVGW)9E>z_UF<
z3<dCzD_g{(Gy2#<=jl7l0q2GJskt9yfZEa)x&!FTT5rsRw8a4zW#PWjw)%zyKqIXh
zdl?Xbz9a;p-fLmzfN;jZ8LtpPUxx_bmQa5S`Zz{Gh$)`~?gGFJ<<dOX5CB(wx@)x1
zsIfp_sS_e*6uoo#yaAe_HRzr?1apQ7ZIYEO3CC!7IX)UX;5vXYO0C#2$QX^BCB>nA
zytxCWhylL$-${Qz^b(aOB&2f%D9P*nAW|%%`-F7vVSpc=5w9lL<tifp0000<MNS1o
Hu0mjfVFMX(

delta 624
zcmV-$0+0QY29*YoBw$xiOjJbx0009nZwyDB3qqACR+<M<!1>X}00030;L#d`c!`OL
z;jgCJo|0$e@38p(u&}VadvQ}V1T{E8>c6yqPX$(5V~nQGW<UjBj@I$&9@^D36F6}K
zGJ7$UM)r|`kbk@uY|&bv*!O?V?#@{z(9{vEc1Aq=CzIQL88SJXz-;Dnxm>qa(w77N
z8vw^SltOn|y#u;FzcwamPuFkqBmlAIeF3n5u46c0C}U}o-7->Yka#W60catC6Z>>n
z3)2{P2aM;ep!Isafl#bbJG-@8$pN<lyg*r&5wHnD4S$VUp65S?!*~b1LIW9(4S0iC
z7DbU6L<LJU7LoZ@<~!3Rh664FIuP2ef+BNj5A`=04Nm|#K!^nIP!@z5;{*C)$PwC_
zy953Vp!o-6jHE0}a!{0Jez3kSq^hd@e&E_2aLHYn2?59+YX~i$5Lu`(r$k?y(`Xhp
zc;M<E9Dkt9jR~{>eDF=vumeSdngFR%Z*&~Zec<XHFbE)z7N7*0iF5$45TLR{@B{!I
z06g0h#83baxw1tpI-`#*+=uZe%mL?x`Kh@dg2CK2x&`RVT4#*nv;%Geuy9}NSbaeP
zppjO!y$lFIUlM{)|1LOXK)7Szj+YCduR{dzNPnmWeH^18#FWngHvwRVa%o;`2!N|T
z-PPJ?)L5Xe&<znY^7vjpQGjM>589^=!JJ`2hh$+}!Z8{i-<%zACBPVkcI*^nj9Si;
z;?RD$xdX<C0lxF!Nq;}|5|yeE@5+e+l;m}O5GfXoOy}+f_y%pxum>ml4y*tG002ov
KP6b4+LSTY}>J}XU