From b4dd0442c52bae2b76705c50bf43bdec06932594 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 10 Nov 2020 16:11:43 -0800 Subject: [PATCH] Fix extension unit test script cleanup (#13345) --- scripts/test-extensions-unit.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/test-extensions-unit.js b/scripts/test-extensions-unit.js index f698e50d37..b7394168af 100644 --- a/scripts/test-extensions-unit.js +++ b/scripts/test-extensions-unit.js @@ -58,9 +58,7 @@ for (const ext of argv.extensions) { console.log('*'.repeat(ext.length + 23)); console.log(`*** starting ${ext} tests ***`); console.log('*'.repeat(ext.length + 23)); - // set up environment - const VSCODEUSERDATADIR = tmp.dirSync({ prefix: `adsuser_${ext}` }).name; const VSCODEEXTENSIONSDIR = tmp.dirSync({ prefix: `adsext_${ext}` }).name; @@ -70,11 +68,10 @@ for (const ext of argv.extensions) { const command = `${process.env.INTEGRATION_TEST_ELECTRON_PATH} --no-sandbox --extensionDevelopmentPath=${path.join(__dirname, '..', 'extensions', ext)} --extensionTestsPath=${path.join(__dirname, '..', 'extensions', ext, 'out', 'test')} --user-data-dir=${VSCODEUSERDATADIR} --extensions-dir=${VSCODEEXTENSIONSDIR} --remote-debugging-port=9222 --disable-telemetry --disable-crash-reporter --disable-updates --nogpu`; console.log(`Command used: ${command}`); console.log(execSync(command, { stdio: 'inherit' })); -} -// clean up - -if (!process.env.NO_CLEANUP) { - fs.remove(VSCODEUSERDATADIR, { recursive: true }).catch(console.error); - fs.remove(VSCODEEXTENSIONSDIR, { recursive: true }).catch(console.error); + // clean up + if (!process.env.NO_CLEANUP) { + fs.remove(VSCODEUSERDATADIR, { recursive: true }).catch(console.error); + fs.remove(VSCODEEXTENSIONSDIR, { recursive: true }).catch(console.error); + } }