From dab12bc2b84604599ff446efc721207815a0688f Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer.bar-yam@moduscreate.com>
Date: Thu, 18 Jul 2024 06:44:13 -0400
Subject: [PATCH] interactive test is working

---
 garage.nix                |  33 ++++++-----
 tests/fediversity.png     | Bin 5640 -> 0 bytes
 tests/green.png           | Bin 0 -> 692 bytes
 tests/mastodon-garage.nix | 112 +++++++++++++++++++++++++++++++-------
 4 files changed, 110 insertions(+), 35 deletions(-)
 delete mode 100644 tests/fediversity.png
 create mode 100644 tests/green.png

diff --git a/garage.nix b/garage.nix
index 2c47ec9..3de3709 100644
--- a/garage.nix
+++ b/garage.nix
@@ -38,7 +38,8 @@ let
 
       ${optionalString corsRules.enable ''
         garage bucket allow --read --write --owner ${bucketArg} --key tmp
-        aws --endpoint http://s3.garage.localhost:3900 s3api put-bucket-cors --bucket ${bucketArg} --cors-configuration ${corsRulesJSON}
+        # TODO: endpoin-url should not be hard-coded
+        aws --region ${cfg.settings.s3_api.s3_region} --endpoint-url http://s3.garage.localhost:3900 s3api put-bucket-cors --bucket ${bucketArg} --cors-configuration ${corsRulesJSON}
         garage bucket deny --read --write --owner ${bucketArg} --key tmp
       ''}
     '';
@@ -124,21 +125,23 @@ in {
   };
 
   config = {
-    virtualisation.diskSize = 2048;
-    virtualisation.forwardPorts = [
-      {
-        from = "host";
-        host.port = 3901;
-        guest.port = 3901;
-      }
-      {
-        from = "host";
-        host.port = 3902;
-        guest.port = 3902;
-      }
-    ];
+    virtualisation.vmVariant = { config, ... }: {
+      virtualisation.diskSize = 2048;
+      virtualisation.forwardPorts = [
+        {
+          from = "host";
+          host.port = 3901;
+          guest.port = 3901;
+        }
+        {
+          from = "host";
+          host.port = 3902;
+          guest.port = 3902;
+        }
+      ];
 
-    environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
+      environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
+    };
 
     networking.firewall.allowedTCPPorts = [ 3901 3902 ];
     services.garage = {
diff --git a/tests/fediversity.png b/tests/fediversity.png
deleted file mode 100644
index 24881fb4a0321f00a18d2c85d5859f9a04f6a108..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5640
zcmV+j7We5=Nk&Eh761TOMM6+kP&il$0000G0000#0RU<M06|PpNR$i!00A5WY1=gZ
zZU55{5fczP4J~=?VcWh&YW05KFS85mP+aQnx=>f_Sl!*xy1Tn$?QyTWy9@Oehg~X2
zy;m2?%0zy@B;OyCWHOoT^!SO036R`Kk|Rk+)Y{Wu0V2#*gy&<rlg;cN`$WV9;Q#*r
zS9enHHPcT6#puQr*MG#opzYqijlR9?oww=<sCtip5f6RgGVG<=Y7*-9)~V}*>pP;t
z<WMB^u(qD9I-xJJVk}fWN6dGM(Z(M?TYqi!61sLE<H2>D!YShVK?b$;Y}JV!Z8wAK
zHbVa|LlfkPwwOfPmWS&&3rC0vviZuqpluy+y{0fV^fKZt+F}xENA`tPuMzGR-Tm2e
zJXHO5Z+5&zTTBJx>N`^pjIHy+tayvIm@Fx)Vos*4id6+{B~*$jCAJcC9Uw`sC11&+
zG-^32Oa`?1!S;j=aSK+HANXY^JL>S0CrnH{{?y$-Nq&Cngo%kKoN@psA&fX}{KV+v
z4*l5%Jpd@Ggs|}`6DG!vKYdqlO%a#0IUe0)qS2}aA|j!mAwth(Qt=<5;s{Sm#j`C?
z9OEuY>US=_=lFgASD-LX68|2B8sLt&rN@qIcbI5Kg+QVMV@zgx%=1f5;x2z$vIqPw
zCvlhmRt3NJyPQ~8`y#UJ%KlK5j1AjMPGo7N`E5-R$)>oknHWSFU*a>hKwPaoH@@Ug
zPxg>FT6=DMDVR~gAH>#Ld!FaHwrx9(BeHM=R0Vt6B05q;E`n7HG(-ytR~*Ai1PKCT
zOtwNv`nwd2B>gCrAP52}cRbG)=P0No0Bw5t9M6<3p1wl?nJz_|84ARBBCHuFynDo$
zk<lZ@Yy_&n4Ht}zA2DV)Az_3UF5PvPU3S@H&y(-@N&;6qzTOj@2teag;<(|G0myoS
zhG0)DbVq26F&Qe!l}I^C-a*<CuCyR_==nd2tDW$hHHi~(0e=?9m3gof<wvk3-iaGk
z4;9ZTyswgS8jCCy$-uBBp{s5AJCcFu&a#C>$asd1U`KQUEHN?TvT!{LNHq>=#}T5b
zfbBbs=V@;na5DV8Yyom6R!{-!^2ix|8~_W~iKA_q29-Co!~#bi>;9Z`e8cH8`9Vpm
z#k5YF@44apo}j#;g}KOE*@tud;4^m))!chXI}I?N6Gt1fCAd2XrpT#yaU|)C7_GG<
zk01j#T0K-Or}1IWq*N_Mmx-f2ISeXyXbFZQt)6m9p6P0as@j!EIYRsGAIE+)^X;La
zD&bIZv?CY6>K<aoDVMaxXsuoOXaKl6u0Qur_uL(M=Y5xgD$>3r)N6sOH9{P1%Z+(N
zPmGX3&!k<MF%Vo8ttIJ);L5yGY?srvM)h_QSKD$s3f%=0kyYmwqqWwK%oqT!j?-0&
z?$9r$;Y&h)tt@!jmMO5hi=fXLp2=vfwJkFSKvgA>*g)Q@%=1^g{PHU=N51;(U{JM2
zilZI5rW*;`$hbwTv@J9GL8a&UZHqqtEb@~t?yJm|_mOr=M~I_cIkP*74Qk$E%Cs$S
z4FIQR%hdj>4vHSq7fEa5dU3QTdqQ<1(G^KvfwtxCfuOWXaxGGhqoh@1dP5xT+v|b5
zlX!6^LYL%)MxxYipaza4rc{u28j7~;G@dIn6e!<-98Y0emus{wCqkumJqk#*1}ywu
zY;DUGu#jumCKcF3#*#ebNTM+l<%Exda*hhv)6<^kx334zKa+|eN}6%xwZsiyN9CDe
zRve#-VrEu~fl=QFuC`?=7!}-EwlHr@E{{FsC^BXuZ22p=M&3o*F|CMQ{TerPjU%59
zAWFoR`dirovN&HnMIvfcVu$C-7^oVVvw6ZT*P|2`Z?xft8*jDyiFbW1#?wyFwHp{o
z8NfYdtpGS*JmF=kn$g;G<OVQmLL0X|eueXz1*$+Bx2^4m<((oTj_29ZxgQjgud?q0
zKWa}K=fxA&M9#3rV<!WiBh!hgMzr?hJ$Ww$t%D#4jB7iN<A}`K4hl&bBU(fPt+h5H
z-%o<d6*FKt!<aJQ$aF9vmAR&?-CUdA{if5lO9?yln-%=dbl7&OtE;Q4WP3(LzPM-=
zC?r-GC+(dj+qUge=L-2f3i)CtlnGa~&z0$5LMlDK5fPb|-t$uNf(q`H#O|{D#|{J-
zl}wPtf65&XSY#-9n<KY_3F#Itn0)h1Q}%*N>$u4`-;(&|$)__C5)Pew(=Fw<-f-EO
z2M;R(P=pE@+fBatme`vn9|)B<o^U3p$mCA7T=_MKkU=7fqIgu5nHiOmMWDn0K&as*
z^jT!W6-myhN}l{0L`a>8EsG;kRaQ9@GpmNiM$1w$iU7cBELi2t%!Jg*iY_n_=a3n2
zDqK_MRL7P3!G!diicN%Qt9P-njCvKDq8X7ri%m^U1pq`yxaMY?4nZ{aYHDg~DmIig
z7MtRG7XUOBdouw5q1e=$^2oGVq=FJ#bnx9!Fj8k+(z@_hqyR9cw$2|0CiHr?WzMXb
zGiT2Fcyllad}qt-Su@{#^$()~DkH)PZ!G<B`KK?Q*&jq$d)~ac^JXr(9?ZCE-bXWM
z&7C)Q*31v*AAtt!+0yby5TI~E%c84^^T_l$7lBibBr~r35en%m>@D&)FhCgmgM3y5
z5sFJCcIT*fCH6N=1b}gi#BK#9tiDvruK_DOEJ-g!0~P0q>;XmG_fs+3AfMc3xex)i
zWt&KQ#*x#g8ic0#{?a}mC>$oi4NxEy7X)8lcJ_Jao_EerP}!@&%4^QK?nUj$1SmjZ
zS21l@9(cr+pFRu*2))m>^+&@25caw9(o1e=H;XU7^pY#L2P^CwgwKL4oGIaCF!CWv
z?h}=6O^rh}pfFAR17JbnUh#H`S||$%@dSQd+ExK@eh|FOM6hs~gl7XluR$OH3Y&Gv
zeNc#PY?C(-O>Dg){upro#ld&0Q(i!cE=z3S*>?Bk4`9aNFJz_#idr<Ju}5QL1H~<0
z$7-N{D`ZX)W!HtWA9@xPqM3H;lt(#&m8FI(m$w^~r3iq+NFy&<xJcwuDC7ne(`AV{
z^jt)}W`&D;!=i&ku7W~Ti$Z+V+Nu#lR)+64M2r>l?rMNyio*7t@(8#LAPihCGZYAs
zj7KCG)8m`))BZ&HW%}eXOR6l$5EO0_e;+j9E-7sr(;{D=F?PbZNqZ&f2dLY8nFa+A
z4O$}M(({G_oCSqprSR!%MJ7QZM<{tf9<mZaZ7{ai@>|fLCE>dSM6`;L^7jFX>iq4E
zfA~;j@mj<H7`uHVBFnDm2hIQ#{w$6Y&g#KbV+=Xtv>rWxbs6Eug(gcxjql5+eXxHh
z7ed9AmMvNG`B(P<D0@RZ5fS_G^+70Stn<6&A~L@joB_rL?Y<)iL!s8V;j-pC8YH^V
zeVOrN{7k{Zl@jiSJEe0ga8!$Yw(*eFhOX8>=5;B(`^wUwb5mG|W?++Be+cB$fkf2<
z<7Nq8v6yO)3);*Bu3kx|hLw#lekdY=NuB}5){abRSS+uD5VcTRi-?a{zB+cX<z<U0
zg1`#cWR8{-p)z36-l5zIg&Zh0bl*s_xwlo0NHqgQ>J54E=boGam0;1JLPMcoQGzuI
z(?w2!iU5?ddf;#gZiZF1W2Zby=_wo#$kcjZxQ1ZiLiy$|^5Z7p1TBpC81TTQVcP~^
z0K6I^$4Yornd0USc>q=w_RlA_c#B^{j7@FR7Q6&TT)6CzJ@?vk&tLTgmAw|Wt$_lL
z6L}np0D9o96L;Qlqr*NovKtrx_OpXmdV%8F!b<iF!YMytKzL0YnFJNLNQ^}804{q&
zR;&qTeo5p6C;+dB*x!67B6kpj(D%`H-*}%N4~|(OZ&$Ft$kaSyi?{eSWZ`75^PBa+
zF-`Nlj*gCw_Rf{Vqh2!Kt^sBYZ*!NfLrgfWWu=I?i_TF*U~J&&&aQU(bAoTp>lN(l
z>RW4p@i)=+z_GBZMJP58-<S~3n+@Bhym^~mh}>}7tqLgLxOw}5AOO9F{qmr_cPb*f
zVasiro3|OZ24bzPw%v%3kkGez_!^+>S-84dZ1EO9B^`{0s#b;xv5aU%5xK1}Qi5*J
z3zzl<RgYM4B32wtQLH!utQ3`jl(H;Eh~;v{30QFj#ENPGRCr%Zb=cx9ek!)y0EN1p
zv6~J|_hw7$Ag1~aj1#qJ<4>NYzt(z{x~_aP42*hSVV_p%)}P%FjQU<-m17>9{d4li
z*6&;AC4cYNV*p0I&j9fCeP#f}sQ*bZeR`)^DZ)?0&+jw-@Bja50aj2rAVvuQ0I)3p
zodGI90c!w0fi{#zqNAY_`QBJN2n6&OrKt9rPS}vIy>65IKjrVX-Ld>1-`;BUKiaSE
z{dRwz|7GmU^uPM=a1ZVO()w0;fc=X7s`rooU+QQ47pMpJUZIcNe_;>XUrtZlzl6Ws
zuiejSpa1<}9YXwooF{&HNw6PF6w>^CJ%HX9G>Yf&qE`}ZF;k|eo8I@m?|awgf~j>l
z!Gj5piy)0>Kall8QW1$wKcsvgl2;Ka1y7dSK}Yqxm5Cjy%=h(zHud>>%(4?ZKNS`=
z7ZPn$qaolg9|>^6)K?qKO7w4Ly0jy7+4n7e*$_Y&UxfG*yrF`o4helyn%KQ~8epdr
zC#w~4thE17ci3j*cN-O^($l31{XM4EfF#|0wlZ@F*o(!F6A84?Q^4LYpgDhq<{0`1
z_}wfsGG&}1l<HcVF4_t4$MFLTVH&-}86}^y!0m>XWJ#X!)j1r|C4_wACX|IMc;&ux
zcJ?+SKe?a){`~k}KZ{ayup`ulq+-#KN|J<o7~*yc!ibsqrHquCb1Jfhr`@FPIRw*7
z!*%XVs3J$8Qg#EbOY5?4sKzh;69m0(uIUm000Eo!qU!teJbey9`nV%kz?153?iv-3
z?G?uu@8ACT%zX{pdpeK5TIW0a1&1m4`LeQ&C`-VN^d+yXrBj^8q~mL-+7_Z9E39~S
zY^DD!CLPPz^-N$V3|RV;DK5Mf)|y%@tx}0~@$OV~jDWZ_Lbdx%P0(ZqJX?7qOw|ta
zQFdM@+BdC|{L)a-ujSp`XMdOvxv;;hsifUM%67bB_Zl4~4+3!-A2ejIW)0y}DCBc%
z(P!h9FyRA}Ps(TgvF7;vfm+4lQhrA?qzi&4a9u-<Q;f*hhvUh#-K`V7R~Ao=7`4Ob
zG{FHgm;e2hUrQzU`L_QxhV`O}s+bWl*NLSZ>r~dT%kW+ew~~N6du;a~@D+`jTL0^_
zZZ=-%HT-u?JPDK<8Hdlo#WyI!j*uyn{P8MnoTJ_B9kJw`^J#m{*CJl<xto!1TKWlq
zKcz#a*rZyoY=ww&|4dcG8>vV-&?7D?$6P)UqRc0kI$mLG>tuJj`{a>!yg;olRb39>
zZ(7j!8O@<DV~bSRVJybO$5E<b!Vm{8PwO+>_tKC^XO%~2ZsyG`<hOAYsswpEw=2Pl
zHa1k*B>QZ>%gO0TX?&Emk$G}dDforOm}AIt7B;SDx%fFPKZ-Rii)CDT?XlgHGb&xo
z0@4dR(@o&H!W&@WEmoQZ1G<PRa^7fYwPIrM>4L{3ef!eAbd)BKCc*1-7SB3WWIc+Y
zKh1aF)rPcJpIAGAjYh=1`aw2rmEVvz<QHE0HCA>HfUDMsBCCLEB70v^fCZ#Zwu3hz
zfAw`xUu<cXJ;6E)zjX2P!Ix^H{nctiwoIE_Dk_8JGmG!<c1Z1tJ@V~}+IF*D0azj+
z_QIUk15?jNwb0K$|7a)wfi?g8p&4~w?Ixl>2u5ZVL~ix*YPB20EErh%PvOhO(>ZDx
z4W*iU9xx)eTn9NnGIkBSfTxxYGW1D`pka?Px%!J_gwz1$PaO}sP6kT^KR+i09<J@S
zW3m;lYu82EZ$=sBG@9TJP{?w3O(dwA89CKwOnZO(^(umJ8D4vE%f@kOZB-_h7VUcW
zRtvy^g6I@Cr!2YGX2gvn+YC8sC=&^sg6KibfCOfWoP+$SS(6d^1;Vret4S*qWG5yh
z&lJgMVgQBV^%w`(B?tdxn-8+2@|bkhz}=2nV&#b%)3W<LbRnKzH7~xm8EQ>}(>TN=
zw>Cs9Td9^q1TTns@#EOX(`YBFL!Bw!7sQ-rbiQ5rB8hK$w>}`%!$7-|tm-sus@PCi
zQR2(Vg^pppuerul#swb_OMM<(Ok`Q}^Md}}SUDoeScZ9%`?MOQK_;f(4aQHDq}{+^
z!ToW1W!%|BSoRr1Fp8StSv8yu#nh__Tzf|!wssjS;P3lt&;dpisIr=X0hie#X)+{y
zMrSR`-oQvhuLJ9H5N`uZ4%?5_ej{+qF2(Fn3+-fHoC7g%4;GsOi`~ytKRa#r=aB*S
zPkm!yo+<7LOKg&6xiZanv>M{2$a@9&vD@#11ol}-r>&j&b}b*jv2kP8K1#`q3zEFc
zqjCp`Vw?;TN^E6!2V;Ct=d`b&3>OgD9z>;ykoxOOx1j!?6Mhq8Aq#4T8@=x2B~i|3
zi2;0!zCr&{e7on>Z6>sMc;Ub|povP#iCQoU(_FwPE9OqW9Pxo`VZK9+-QK^=zh-WP
z7uA)5i#(f?k(3e)--Zrr@)5D>VA$>?#em@F;{Ra+KwF1V$SEv}h`X}@u5@B4mPj_{
zVmiZ5$)p_HoIV%3xSse~{^hrBywv-yN`Ox*(2s8&qg$FhLW52AZmrJ#k!AJ7#3$iP
zWhNk<=uIrgYZ9XPaw$&bQIQ}QgOqGjTUXXJ?a9aw<kZ`3sF6n2?ontwNI-nJ2v<kS
zu?Y&pYfIdFytyO}7oapCT|J&n)pLQg0<;&Ehi!(t+b6}22C(r21Xyay6Kd%g(0=B*
zh$oC)DV~lEHe{Vi?QO8(u>R3vk7abGxHo1=l5f7m%oou!+t#+)ggGYH6*qOoJr4yS
z*xAw7)(2Q4NF{F`S9Y3&&9PuV1qA22`zDvoS^ILw7_|1C7zPliaC<hm7^s%}x?lg~
zY5&@H|NVZqhykeZff+=^$q3Gq&0m@x&M<%Rx+tiE*Y_7oZVdtWe%{+$2RRK;qBN_H
z4VG-qQO5%tiwrqCt+KvIiUZbQDa!&^!>syX52LQMpg$^P+Rn!Wp}{FAT~y@OsBjdR
zh4&OS!|@So4U?~}m8w&Lfv#$)^@;2O!9*&Tt<h*Nh+BVl@Ev<0dxN;;No_;5+`$Ya
zzM$V)K*;Ys3MSqwiidP6A6nc`kCC-y$sMOlB$mV6Pm2bI-&P-0hXA}qdcaXcHPZz_
z$vHXnAA$%$#$EF;YakydS@Q}%`7cUTuFnOw%iI!RCs<_JAy%mDse2E3TJ6~{wOSxO
z_P3Q3dQU&y!@vLGJU`V2aO&yE-w%9I{Pu)aBC!P!6JiXMa?Nz24-U5JI!$B&kmQno
iCucGrrjB5~rTkEvMM8dx%7_2}00000000000002+`?-Js

diff --git a/tests/green.png b/tests/green.png
new file mode 100644
index 0000000000000000000000000000000000000000..35161098f4ba304521155d937e6b31d6e1020809
GIT binary patch
literal 692
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFflVQFt%hmI|q0=J1Z0v<)>xlq%tsQ
zOst(~>v7mY=4gEI)<vQ0)*TipEBwj=1&>FyDur-tbz04*HocC+S89@oxckAa4;~y(
zx_a<vWH@`cqre}A!m@&(l8Hk9r;9`#sVKP9U;bUL{5`|MxU^YU1=&sRnq5BGGUM#p
zj)mbZ7rG60UC=i^J!9$;k(%SzZJBEJc7N3QUtHg3XPR%QpdfU7X5y_Qua8`wz3pJ-
ze2YU~o4jiLZ1OI#cFONuSMlfA&KH{w7%Qi#*}BUpigo9%*<z?YQ|hBgVaU~zQ{tQC
zR?pdPk^NLF``+aJ26L`YpT5Jdn8i~kK~Ts=V?`2k>Wz+zt0pHY`u^sW|G(k&^b<=b
zWHa~3d|u(u{N~re{}0Nyhb0yr^5#-+I46Gmrv$6hZimIsEbbrgyKKSObpF89d!NEz
z9XO-@a_clPTPC(`joq)OEqlW_-TJ_V$%?Z#X|rZ>wK9FEbGtu<nJvF@Ug-Mm&+Po<
z8+b~m?qcNQYuu=my8h>$-Mja0uRm|{`!}Q1>7wQtOSe1$Mhj<wM`SSrgPt-7Ggd6M
zF9Qm)mw5WRvcF*G=3&#jP+|>~XOJv$jVN)>&&^HED`9XhN=+<DO;IS%EXh!C_w)@2
zZ{!mPDw^l%;uunK>+J<YMg|5B<^`Gm&qW<P&#n|Ov)~F>%E?Kp-qUngH$fOokq}0s
z4w$jjVH%hbqySU{6w#ajQXIKS<OEn(B<0$FZR?C@Jg(Bbi3jLX22WQ%mvv4FO#o9x
BA65VW

literal 0
HcmV?d00001

diff --git a/tests/mastodon-garage.nix b/tests/mastodon-garage.nix
index c20a771..c423f86 100644
--- a/tests/mastodon-garage.nix
+++ b/tests/mastodon-garage.nix
@@ -1,7 +1,37 @@
 { pkgs, self }:
 let
+  lib = pkgs.lib;
   # python = pkgs.python310.withPackages (ps: with ps; [ requests aiokafka ]);
   rebuildableTest = import ./rebuildableTest.nix pkgs;
+  seleniumScript = pkgs.writers.writePython3Bin "selenium-script"
+    {
+      libraries = with pkgs.python3Packages; [ selenium ];
+    } ''
+    from selenium import webdriver
+    from selenium.webdriver.common.by import By
+    from selenium.webdriver.firefox.options import Options
+    from selenium.webdriver.support.ui import WebDriverWait
+
+    print(1)
+
+    options = Options()
+    options.add_argument("--headless")
+    # devtools don't show up in headless screenshots
+    # options.add_argument("-devtools")
+    service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
+
+    driver = webdriver.Firefox(options=options, service=service)
+    driver.get("http://mastodon.localhost:55001/public/local")
+
+    # wait until the statuses load
+    WebDriverWait(driver, 90).until(
+        lambda x: x.find_element(By.CLASS_NAME, "status"))
+
+    # XXX: how do I save this to the derivation output?
+    driver.save_screenshot("/mastodon-screenshot.png")
+
+    driver.close()
+  '';
 in
 rebuildableTest {
   name = "test-mastodon-garage";
@@ -10,13 +40,29 @@ rebuildableTest {
   # skipTypeCheck = true;
 
   nodes = {
-    server = {
+    server = {config, ...}: {
+      virtualisation.memorySize = lib.mkVMOverride 4096;
       imports = [ self.nixosModules.garage self.nixosModules.mastodon ];
-      environment.systemPackages = with pkgs; [ toot ];
+      # TODO: pair down
+      environment.systemPackages = with pkgs; [
+        python3
+        firefox-unwrapped
+        geckodriver
+        toot
+        xh
+        seleniumScript
+        helix
+        imagemagick
+      ];
+      environment.variables = {
+        POST_MEDIA = ./green.png;
+        AWS_ACCESS_KEY_ID = config.services.garage.ensureKeys.mastodon.id;
+        AWS_SECRET_ACCESS_KEY = config.services.garage.ensureKeys.mastodon.secret;
+      };
     };
   };
 
-  testScript = ''
+  testScript = {nodes, ...}: ''
     import re
     import time
 
@@ -26,33 +72,59 @@ rebuildableTest {
       server.wait_for_unit("mastodon-web.service")
 
     # make sure mastodon is fully up and running before we interact with it
+    # TODO: is there a way to test for this?
     time.sleep(180)
 
     with subtest("Account creation"):
       account_creation_output = server.succeed("mastodon-tootctl accounts create test --email test@test.com --confirmed --approve")
-      password_re = re.compile('New password: (.*)')
-      password_match = password_re.match(account_creation_output)
+      password_match = re.match('.*New password: ([^\n]*).*', account_creation_output, re.S)
       assert password_match is not None
-      password = password_match.groups()[0]
+      password = password_match.group(1)
+
+    with subtest("TTY Login"):
+      server.wait_until_tty_matches("1", "login: ")
+      server.send_chars("root\n");
 
     with subtest("Log in with toot"):
       # toot doesn't provide a way to just specify our login details as arguments, so we have to pretend we're typing them in at the prompt
-      server.send_chars("toot login_ctl\n")
-      time.sleep(0.2)
-      # Enter instance URL
-      server.send_chars("http://mastodon.localhost:55001\n")
-      time.sleep(0.2)
-      # Email
-      server.send_chars("test@test.com\n")
-      time.sleep(0.2)
-      # Password
+      server.send_chars("toot login_cli --instance http://mastodon.localhost:55001 --email test@test.com\n")
+      server.wait_until_tty_matches("1", "Password: ")
       server.send_chars(password + "\n")
+      server.wait_until_tty_matches("1", "Successfully logged in.")
 
-    with subtest("Post an image"):
-      server.succeed("toot post --media ${./fediversity.png}")
+    with subtest("post text"):
+      server.succeed("echo 'hello mastodon' | toot post")
 
-      # TODO: I don't think there's a good way to test for whether the image visually shows up. 
-      # we can test for CORS headers using curl / xh
-      # or **maybe** somehow read the javascript console?
+    with subtest("post image"):
+      server.succeed("toot post --media $POST_MEDIA")
+
+    with subtest("access garage"):
+      server.succeed("mc alias set garage http://s3.garage.localhost:3900 --api s3v4 --path off $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY")
+      server.succeed("mc ls garage/mastodon")
+
+    with subtest("access image in garage"):
+      image = server.succeed("mc find garage --regex original")
+      image = image.rstrip()
+      assert image != ""
+      server.succeed(f"mc cat {image} >/garage-image.webp")
+      garage_image_hash = server.succeed("identify -quiet -format '%#' /garage-image.webp")
+      image_hash = server.succeed("identify -quiet -format '%#' $POST_MEDIA")
+      assert garage_image_hash == image_hash
+
+    with subtest("Content security policy allows garage images"):
+      headers = server.succeed("xh -h http://masstodon.localhost:55001/public/local")
+      csp_match = re.match('^Content-Security-Policy: (.*)$', headers, re.M)
+      assert csp_match is not None
+      csp = csp_match.group(1)
+      # the content security policy should include the garage server
+      garage_csp = re.match(".*web\.garage\.localhost:3902.*", csp)
+      assert garage_csp is not None
+
+    with subtest("image displays"):
+      server.succeed("selenium-script")
+      server.copy_from_vm("/mastodon-screenshot.png", "")
+      displayed_colors = server.succeed("convert /mastodon-screenshot.png -define histogram:unique-colors=true -format %c histogram:info:")
+      # check that the green image displayed somewhere
+      re.match(".*#00FF00.*", displayed_colors, re.S)
   '';
 }