From b9da0480969db028e2601ad547ad5041af86dfd9 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 28 Jun 2016 14:13:32 +0200 Subject: [PATCH] tests: Add test for "use-git" patch application --- tests/0001-Add-test-logo.patch | 165 +++++++++++++++++++++++++++++++++ tests/Makefile.am.inc | 1 + tests/test-builder.sh | 4 +- tests/test.json | 7 +- 4 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 tests/0001-Add-test-logo.patch diff --git a/tests/0001-Add-test-logo.patch b/tests/0001-Add-test-logo.patch new file mode 100644 index 00000000..bca1dbc3 --- /dev/null +++ b/tests/0001-Add-test-logo.patch @@ -0,0 +1,165 @@ +From 0217f4780557e67c55518161f28aa7848f7009c9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 28 Jun 2016 14:03:39 +0200 +Subject: [PATCH] Add test logo + +--- + org.test.Hello.png | Bin 0 -> 7416 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 org.test.Hello.png + +diff --git a/org.test.Hello.png b/org.test.Hello.png +new file mode 100644 +index 0000000000000000000000000000000000000000..751ddbdb11c88d5e45da6940966cddc116d35983 +GIT binary patch +literal 7416 +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 +zQjuy(JPH6J +z84ANJbKj4r3RD}N6;apb+C-s^0v0CMedyM}yJ!6q0-^2lu7T9zT=Nf`jk1KW;vc^2 +zv~alhgG=4|JSWI#nJpubxy`DIU2)FN&V@hRdFL(rU;gq(WB4CO%1o`Z)aOGnHsdS( +zjOk$)715OBiA}iw2`Ddee?J(Fl&KgF4(DjS0*{ieMHpmV^9ODYdDK1iTgxBpZ{Ao~ +z3NThJDvFA*bVj$;!Wj*apMt~OAb0$Zs>%kLD=-;eZ^ar`pU3Gpmm!z$}&7rgXmLQnylg +zVoL+c!n?sRM;v2Nq~E#TOJ;R6pOSVUpaa-|LH0RJz^U$SYrRsYx%OxMZ$YAM<_p>s +z8KpHU1&eEG+S+)@r^3VGa3OM=j;B)%6zi{3OLQbnFzU4+>sg=S0*=%*6)1j8WpeAd +z%)4Qr&4fUPO=ABbQ3L4!Oj?m_>+^I{U=XPk`-WJb$BeL$X1fBw)#Cu$mA$6VQ7iUX +z@Zhm(FDFky$^QOGZt*k^X#XbwPdxEN(1Ve(owm-;%eX6VFgbsIr;tnRp$I%ou%0UO +zsRE&AS;Qr3y=@XaW``c9)G-~XK;E^HEa{6@IZsl74W|iW$0!t}B%Muz+nO0R%OBdhmkhuo^w~tA&*0?fnm=y4L +z{CZ*1T!z=Y_6^~&#~uwg-gsxY`KG(V_1E8_A7C+})nN)_L+I#4|24Lk#`NAH! +zRzz;Fc}~E)l%+i!4(^{!$N6>FUH@0L^W?Pd`(FXz_}u3{A71;~$77-CYPhy`oo@W_ +zAj@vi8VwdHD^0dcEn!?TR#<{if+8>N$YOM5IO8@pI#=1GU7BQ4@9nU$IZ!EYYE;g` +z&wl=Myk_8e%Fs~2!=K0KHI3tY+5v&-@*hM$% +z_a8nSjb>Y$o4m1-d$3YOZP?!k=VAzg&eeNQnFhq? +zf}9J23Vi2k|HW!e9RWmWq#z*h`lTo+uRvC^9u9v9VP`XT9$-=D(qVT0WYkm_!esS8 +zt>mFrvuJH|LaSyvr_r8bG4fIZ;3Nb>=TJtuZ?#mx +zAMi1J7;t$-&?_nY*sHkULG#FAF9}NL`NIY +zai9fM2+%T*nnWkWAu}r#!C(M&`?piKOGIoP6uXaDFe+P$K#(Hs+<7Qoy#U7O5CTCF +z6|sOfBm&{xka1!f`2TYXRjLhcwNmQ#`TWPktmxQ|9XrC`pMWmzx#u1V;ENXgvbg|2 +z9CwR4r?+!k+6`IP*^5pGRa)H^*6Zon=AcGKt&H_~>TNc4Lh_{C_=w%_`Ob=r;-evf +z)5)U@T9w*YBNdBWCbu%)%Y@ZVhbtT(6-d!&)vCDozNHR(OEY1(H2ayRsOsuCZ*ESe +zrm3lVw}*0ltX8{(>Crn;uBuz66?3Gvu_jj|Cq=S|1clSacNn8Wp3jQf6J#n?1S_F! +ze3-ZKJh9fBJkE^1p@V^dzm5^4EgLp$5PtRRaJRf?Mg4{i$Z2c|G#^;>^2YiT`OE8C +z)Wxa&RGW&;k^HH`=BBhn=|c?`zP7NSsZVox=`*Q4rO#U8hBwHy(Pg3b_BX{`^v+QC +z4F8!{MqqvVJ3q8c1cV(SHW2y +z+cPsYs(f$$rtCo(N5oF+(u~yjjTUVm_gT9nKVD*;U+U@=?G%)p5AxUgMAMJTg{0bm +zwin&Gdf%RP%U-hX+rLvl7c71ORTRf1BNQD{rL;8lrI6PfeYvfcTaQ~D>$ +zV`=b}mv3kUuwdHbn+t}{na#ZTz}p=$Swei@bmOVl@0>SL!jkcJuh+QL!=}eDyr|U_ +zY>Cm!BBOhzIZ{&MvNIiR@xp|_^ju`_jg^|cA_R=YOS?Bv%S`H^|MpEi9y*z9dz$-=RPvgJX +zXs+%D#|LHj(j~7PI;oP0`h0TtCDHr#*W~DRm@gJX=JBFHEW%NL5Sx5{cs#zq$k-_6 +zgJ4j+(qzI_S}m?r$Z@?=fyh7*)?g4v`~hrXS=8R~{OUQU%g>J4_|`e2va({nJ+IXO +zya0H7zh6HEEcotvLTt5(ivrF*5Ujii3#@fZtEqI}${MnWLr;dI> +zZ|rjpy2v|c+5@S>QnT?bRlAwvOd8R;=!^|NjW6>0yy~YuH!SB{77j!z4;S*WXr +zS|Y(1J}gKHbv55|`%IA}3b$}DT@mKdV6)M+dXH~mq>Kgw0o1cBx^3HA>>WHa`{s;X +zqk6-J&G`a_ASOuKviIegzi4kU}TvEs?UMwWhKV +z-z6-0a8fb=C%z<#dw7fxa%&kDXZ2d-@?lB!-0`_QKRWmE<1HWewmH2{KaXo=a#_@6 +zvxkl2c^vTs@U}vZIbu0Gy>Duac+J*ATXwp#kx~Q*f#!w_&a4-Rbv +zX6!gxq%Y-F_fOEVtK(ygPe`SBxLX{iRn_28yA{vNwTRPe{14sv>JrJ(9Xpn9S+Sxl +zp*uO+ZpLA)21f%yG)g6~B=*FSuEkt`%oNbxGa26qeIER-uY=cKmyPd{Gj-CrGq27| +zi!dnrWTg?`*)u5i1yQ$h*|AqQSDA;6%8W-K7$8ao?$Jdc*NY$uOBmS$9BZ>;p1w0T3!-&#p +zFwE^igIEIcW+M;|L!;Fo$!tZDl7pQULF{nifX9d1LISSvdN7A$(E3NO0fM=F@nLkK +zOt^9Q$kF|$MaViIR3-Qk=bS@meFMA##iZycJQ1Nm0w=}+iw$opRUi@;Bn)JUC5Ul4 +zu~Mss@!o6@5sO%n2-N4rQmqClAs&oMi9EFuZ+kt+5Q|XPyEozS8?gAb7^bh&=Eu>U +zhs}QTt^$0I&6_Fu_Cr5D3@t;DzyOWmFdlKbu)*SjB|;9);R5;WQ@C^UU;{v%2XhPc^ae*yHiQS=)kXGsY1Q +ze!$@Zs_PMpr3`}c_Z#t(S+T}rYB +zLoby;?)1RxGQ%-xG70^GQ{azh0RRC$5d($a2?>70_16;$z=GcagTDz^JK`e^80&PQ +zB~0-P`~woO&q5iw3>UK^aD?D!lpdKYR?vS>0#Jrtu`#&TV#7j*2aA app-data cp $(dirname $0)/test.json . -flatpak-builder --repo=$REPO $FL_GPGARGS --force-clean appdir test.json > /dev/null +cp $(dirname $0)/0001-Add-test-logo.patch . +flatpak-builder --repo=$REPO $FL_GPGARGS --force-clean appdir test.json assert_file_has_content appdir/files/share/app-data version1 assert_file_has_content appdir/metadata shared=network; @@ -48,6 +49,7 @@ assert_not_has_file appdir/files/cleanup/a_filee assert_not_has_file appdir/files/bin/file.cleanup assert_has_file appdir/files/cleaned_up > out +assert_has_file appdir/files/share/icons/org.test.Hello.png ${FLATPAK} build appdir /app/bin/hello2.sh > hello_out2 assert_file_has_content hello_out2 '^Hello world2, from a sandbox$' diff --git a/tests/test.json b/tests/test.json index 2b585a2d..da41afd7 100644 --- a/tests/test.json +++ b/tests/test.json @@ -24,7 +24,7 @@ { "name": "test", "config-opts": ["--some-arg"], - "post-install": [ "touch /app/bin/file.cleanup" ], + "post-install": [ "touch /app/bin/file.cleanup", "mkdir -p /app/share/icons/", "cp org.test.Hello.png /app/share/icons/" ], "make-args": ["BAR=2" ], "make-install-args": ["BAR=3" ], "sources": [ @@ -49,6 +49,11 @@ "mkdir /app/cleanup/", "touch /app/cleanup/a_file" ] + }, + { + "type": "patch", + "path": "0001-Add-test-logo.patch", + "use-git": true } ] },