From 813b69950cb6eb2a9560fa6420938b3a3b57c0f5 Mon Sep 17 00:00:00 2001 From: igorklopov Date: Fri, 19 Aug 2016 11:26:18 +0300 Subject: [PATCH] fixed tests --- test/system.js | 7 --- test/upload.js | 161 +++++++++++++++++++++++++------------------------ 2 files changed, 82 insertions(+), 86 deletions(-) delete mode 100644 test/system.js diff --git a/test/system.js b/test/system.js deleted file mode 100644 index 1cccc9c..0000000 --- a/test/system.js +++ /dev/null @@ -1,7 +0,0 @@ -import { system } from '../lib/index.js'; -import test from 'ava'; - -test(async (t) => { - t.truthy(system.hostPlatform); - // TODO more? -}); diff --git a/test/upload.js b/test/upload.js index 124b8ea..11f0d9b 100644 --- a/test/upload.js +++ b/test/upload.js @@ -19,7 +19,7 @@ const actions = []; let lastLocal; const assets = []; -require('../package.json').version = '7.8.9'; +require('../package.json').version = '1337.0.1'; require('../lib/temp-path.js').tempPath = function () { return path.join(__dirname, '../temp'); @@ -49,6 +49,9 @@ require('../lib/spawn.js').spawn = function (cmd, args, opts) { actions.push([ cmd, args.join(' '), JSON.stringify(opts) ].join(' ')); }; +require('../lib/spawn.js').progress = function () { +}; + require('../lib/copy-file.js').copyFile = function (src, dest) { src = relative(src); actions.push([ 'copyFile', src ].join(' ')); // dest is flaky @@ -75,90 +78,90 @@ test(async () => { const { main } = require('../lib/upload.js'); await main(); const mustBe = [ - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v0.12.15 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R00000.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24002.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24204.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24262.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24266.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24523.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24543.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24639.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24642.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24643.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24644.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24824.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R25039.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R25444.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v0.12.15.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu x64 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v0.12.15 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R00000.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24002.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24204.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24262.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24266.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24523.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24543.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24639.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24642.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24643.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24644.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24824.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R25039.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R25444.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v0.12.15.patch {"cwd":"../temp/node"}', + './configure --dest-cpu x64 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[]} v0.12.15-linux-x64', - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v0.12.15 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R00000.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24002.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24204.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24262.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24266.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24523.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24543.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24639.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24642.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24643.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24644.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R24824.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R25039.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R25444.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v0.12.15.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu ia32 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[]} base-v0.12.15-linux-x64', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v0.12.15 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R00000.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24002.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24204.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24262.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24266.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24523.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24543.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24639.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24642.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24643.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24644.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R24824.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R25039.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R25444.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v0.12.15.patch {"cwd":"../temp/node"}', + './configure --dest-cpu ia32 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"v0.12.15-linux-x64"}]} v0.12.15-linux-x86', - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v4.4.7 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R32768.v8=4.5.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v4.4.7.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu x64 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"base-v0.12.15-linux-x64"}]} base-v0.12.15-linux-x86', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v4.4.7 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R32768.v8=4.5.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v4.4.7.patch {"cwd":"../temp/node"}', + './configure --dest-cpu x64 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"v0.12.15-linux-x64"},{"name":"v0.12.15-linux-x86"}]} v4.4.7-linux-x64', - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v4.4.7 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/backport.R32768.v8=4.5.patch {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v4.4.7.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu ia32 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"base-v0.12.15-linux-x64"},{"name":"base-v0.12.15-linux-x86"}]} base-v4.4.7-linux-x64', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v4.4.7 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/backport.R32768.v8=4.5.patch {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v4.4.7.patch {"cwd":"../temp/node"}', + './configure --dest-cpu ia32 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"v0.12.15-linux-x64"},{"name":"v0.12.15-linux-x86"},{"name":"v4.4.7-linux-x64"}]} v4.4.7-linux-x86', - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v6.3.1 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v6.3.1.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu x64 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"base-v0.12.15-linux-x64"},{"name":"base-v0.12.15-linux-x86"},{"name":"base-v4.4.7-linux-x64"}]} base-v4.4.7-linux-x86', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v6.3.1 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v6.3.1.patch {"cwd":"../temp/node"}', + './configure --dest-cpu x64 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"v0.12.15-linux-x64"},{"name":"v0.12.15-linux-x86"},{"name":"v4.4.7-linux-x64"},{"name":"v4.4.7-linux-x86"}]} v6.3.1-linux-x64', - 'git clone --progress https://github.com/nodejs/node node {"stdio":"inherit","cwd":"../temp"}', - 'git reset --hard v6.3.1 {"stdio":"inherit","cwd":"../temp/node"}', - 'patch -p1 -i ../patches/node.v6.3.1.patch {"stdio":"inherit","cwd":"../temp/node"}', - './configure --dest-cpu ia32 {"stdio":"inherit","cwd":"../temp/node"}', - 'make {"stdio":"inherit","cwd":"../temp/node"}', + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"base-v0.12.15-linux-x64"},{"name":"base-v0.12.15-linux-x86"},{"name":"base-v4.4.7-linux-x64"},{"name":"base-v4.4.7-linux-x86"}]} base-v6.3.1-linux-x64', + 'git clone --bare --progress https://github.com/nodejs/node node/.git {"cwd":"../temp"}', + 'git --work-tree . reset --hard v6.3.1 {"cwd":"../temp/node"}', + 'patch -p1 -i ../patches/node.v6.3.1.patch {"cwd":"../temp/node"}', + './configure --dest-cpu ia32 {"cwd":"../temp/node"}', + 'make {"cwd":"../temp/node"}', 'copyFile ../temp/node/out/Release/node', - 'getRelease v7.8.9', - 'createRelease v7.8.9', - 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"v0.12.15-linux-x64"},{"name":"v0.12.15-linux-x86"},{"name":"v4.4.7-linux-x64"},{"name":"v4.4.7-linux-x86"},{"name":"v6.3.1-linux-x64"}]} v6.3.1-linux-x86' + 'getRelease v1337.0.1', + 'createRelease v1337.0.1', + 'uploadAsset {"upload_url":"https://example.com/assets{?name,label}","assets":[{"name":"base-v0.12.15-linux-x64"},{"name":"base-v0.12.15-linux-x86"},{"name":"base-v4.4.7-linux-x64"},{"name":"base-v4.4.7-linux-x86"},{"name":"base-v6.3.1-linux-x64"}]} base-v6.3.1-linux-x86' ]; assert.equal(actions.length, mustBe.length); for (let i = 0; i < actions.length; i += 1) {