From 90558e58b31852eecb70daa614f8986698912cf6 Mon Sep 17 00:00:00 2001 From: Frederik Wallner Date: Sun, 3 May 2020 21:01:30 +0200 Subject: [PATCH] Create xar during test instead of using prebuilt --- .../archive-content/file-with-ç-character.txt | 1 + .../__tests__/data/archive-content/file.txt | 1 + .../data/archive-content/folder/nested-file.txt | 1 + .../__tests__/data/archive-content/test.xar | Bin 0 -> 1032 bytes packages/tool-cache/__tests__/data/test.xar | Bin 1020 -> 0 bytes packages/tool-cache/__tests__/tool-cache.test.ts | 13 ++++++++----- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 packages/tool-cache/__tests__/data/archive-content/file-with-ç-character.txt create mode 100644 packages/tool-cache/__tests__/data/archive-content/file.txt create mode 100644 packages/tool-cache/__tests__/data/archive-content/folder/nested-file.txt create mode 100644 packages/tool-cache/__tests__/data/archive-content/test.xar delete mode 100644 packages/tool-cache/__tests__/data/test.xar diff --git a/packages/tool-cache/__tests__/data/archive-content/file-with-ç-character.txt b/packages/tool-cache/__tests__/data/archive-content/file-with-ç-character.txt new file mode 100644 index 00000000..5803ea15 --- /dev/null +++ b/packages/tool-cache/__tests__/data/archive-content/file-with-ç-character.txt @@ -0,0 +1 @@ +file-with-ç-character.txt \ No newline at end of file diff --git a/packages/tool-cache/__tests__/data/archive-content/file.txt b/packages/tool-cache/__tests__/data/archive-content/file.txt new file mode 100644 index 00000000..f2da98ad --- /dev/null +++ b/packages/tool-cache/__tests__/data/archive-content/file.txt @@ -0,0 +1 @@ +file.txt contents \ No newline at end of file diff --git a/packages/tool-cache/__tests__/data/archive-content/folder/nested-file.txt b/packages/tool-cache/__tests__/data/archive-content/folder/nested-file.txt new file mode 100644 index 00000000..37922426 --- /dev/null +++ b/packages/tool-cache/__tests__/data/archive-content/folder/nested-file.txt @@ -0,0 +1 @@ +folder/nested-file.txt contents \ No newline at end of file diff --git a/packages/tool-cache/__tests__/data/archive-content/test.xar b/packages/tool-cache/__tests__/data/archive-content/test.xar new file mode 100644 index 0000000000000000000000000000000000000000..5175658d238570115f7a39ef15d35784f856d86b GIT binary patch literal 1032 zcmV+j1o!)RVR9h=8~_0T0000000Vab0000001Q0<0004a+SHfHZsRx*hVOX_Lw7~o z7eP@D4fGRuE_0)}#6sJWAt@QBUuYg=UTjD$wj4`H(v4|M0|rDEe^zm+Pi19~r^9~p zVw<+CtA_~QgJ@$bU7NCcdWinmevL)+nBQe5)#P`ZtgE$uY%<+g)%h85R~~GR00J?f zF~D0WQc6+;v*cRRPuf}it$jXh+U|94AEI`rU=&6+S?yeFyBuW6*y^oq`8_z#lD-jK zB$JQ6=gPg^l;$DAqnoc~Wo+{$M7G;8tT$Jxs#~k;%CsTGygLZ`B|^#lE};Ky0Z98_ zmQ0KHp%rRmQrJbS})Yn$9P)-SyLmL+|681M=T{53sK(nD=*4tUsf z-|UUXzLeTlbq*Ql90lKJQ!gm1prul9D7eUyq2CX6uSc7kva!0Wn^%97p?^2rhu?^+ z_kLC3Hl|&juaiXMy%^Q0p}EQSwtDJzIhI*6HphW6V?y*<@=WQ2;U#^7aZ2tf3Dxnq zFLj@($tiyNULK?5tUYy&(w#N&a_S;um1GiYMujZ|(+WtUgd$o1=_tk0H>l=Wa_eb| zp&Gp_Usgj1g*bEsQYATtLJ7wpW(aVK70^%^ryS(M-^-1o@eGs8A+GRo4G1KFV+^TttJENTMa?QU5M5z&;pVMBdd1BuIJe}iqqD%y z1P>!*2G9HSyunA#@frCEOw7<3*{N(Baw!bncc*R+Q4);9yYk#RgN4TT02#5pEZatoXx4)~l`(ux97qC8`iKxfvGdXFd#3!@07 zMq6DNASHlIK_;Dc%=4-tC@{uGt`Ri@>VH&kh*+*SOR|M}^HwH*RlT`J=9Be?-`1Nq zyo{yhhLa^Y;3^y#FT;Vr5*z`g{{{|L2+g#k4p0QFrAGMDz@)N}QjUd{zCs`)iei8T>R|t1&}5E_rSjZ009600|3{Kl>6z72J;ak3HQ#C%J_xG zPaQ*#^Kf|DOUukj)h*8~$2dq_?o%YUAG3$_tn2JyleU!!w@qqlr`s?hYKx=GFai|; zL`d$COu_{sjpven(B7FZ>{7w66#ExNY_twq4IAt-Nnso1ruwt=`)dU%TLG+#6kp zc#6@td~tA_!ai=v80J$^T37$o&FpsLw835KvTB^EO50=i0T>~mQ8b@XwPi3pJh#12?OMS^&c9j`Kd7fmEo zCKQ59Uu92q^?b^jR(qeuLu2q4w%@$&-aDQfS7*LH13;2M^G>X!8J*bm30{s zC=Bn--f7)SVO&{dz=aUFi+yqRf}-rS1S?>e(lj30eOLQ>a+xh^XWFWM4O`i@ABMvT z58|ssSXFl-(^Fl}mTt$hvAWfRxk(SMd}{X@QE5DyW5<|2Le4U2$|VBVT3pDOweBHzqSmw0!6iBHg z4YQCXWG>7I6rqr%utO;6uNz+0fLS315~^mztRe$=hRixMWX8-YH22i3W3#}`1P<@A z{{qh2=vDoosNeaY({QM*K~Q*b$)2i?JYoY=Nw*|7wZBQ9$%O@=`eDH*&L~f zC`RT)4M24-`YTZH;OR}Aaxg%#5QH)%9P*ZW6!KjwCv#v_2fi2uZ`W~pizWlP)s!)7 zoXIUx3IW%^l{cOTRt=z>5MtFDO*b(8(S?U6SiV(whG_hE6`nai?<+iFq40bM&scNr zpjjdXR!JdbnG}qcNa?uxHKg!d8g4xEh+*U$voh2OuCxQj1d&dKQh}{h|DP0(fXO^J ziW-~e)C!6m=FSNx1jW=U?m2Uw{Z3MTRBnFF=Nb7KN+4nIM^M7wK}qya(e9)F{tc(9 z`vj_2xCx`XAA~gSe;2+1009600|0l|n}fzxHsd)Q{qJW|T2so2vilO63ygT$OUukj z)h*8~$ { const tempDir = path.join(tempPath, 'test-install.xar') - + const sourcePath = path.join(__dirname, 'data', 'archive-content') + const targetPath = path.join(tempDir, 'test.xar') await io.mkdirP(tempDir) - // copy the .xar file to the test dir - const _xarFile: string = path.join(tempDir, 'test.xar') - await io.cp(path.join(__dirname, 'data', 'test.xar'), _xarFile) + // Create test archive + const xarPath = await io.which('xar', true) + await exec.exec(`${xarPath}`, ['-cf', targetPath, '.'], { + cwd: sourcePath + }) // extract/cache - const extPath: string = await tc.extractXar(_xarFile, undefined, '-x') + const extPath: string = await tc.extractXar(targetPath, undefined, '-x') await tc.cacheDir(extPath, 'my-xar-contents', '1.1.0') const toolPath: string = tc.find('my-xar-contents', '1.1.0')