From b0853cb3bb5d4c172609d59f757d0a5ca893467c Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 21:28:21 -0500 Subject: [PATCH 1/5] fix bootstrap condition indentation --- script/vsts/platforms/templates/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 1d57b688d53..898d8273c16 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -28,4 +28,4 @@ steps: GITHUB_TOKEN: $(GITHUB_TOKEN) CI: true CI_PROVIDER: VSTS - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) From 44fa354c18f683be9b756ab77042649048e17263 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 18 Jul 2020 01:55:55 -0500 Subject: [PATCH 2/5] use new-item to not conflict mkdir on macos --- script/vsts/platforms/templates/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index 72389353e26..8b3e4eb0d29 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -49,7 +49,7 @@ steps: # Crash Reports - pwsh: | - mkdir -f -p $env:ARTIFACT_STAGING_DIR/crash-reports + New-Item -Path $env:ARTIFACT_STAGING_DIR/crash-reports -Type Directory -Force if (($env:AGENT_OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) { cp "$env:TEMP/Atom Crashes/*.dmp" $env:ARTIFACT_STAGING_DIR/crash-reports } else { From 6d50f3fc5a90184a41ddbefc128d7b5ff73d2fdd Mon Sep 17 00:00:00 2001 From: aminya Date: Sun, 19 Jul 2020 12:54:17 -0500 Subject: [PATCH 3/5] fix: rename windows job back to Windows --- script/vsts/platforms/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 81a36df75fb..98af05ad7e3 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,5 +1,5 @@ jobs: - - job: Windows_Build + - job: Windows dependsOn: GetReleaseVersion timeoutInMinutes: 180 strategy: @@ -71,7 +71,7 @@ jobs: condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - job: Windows_RendererTests - dependsOn: Windows_Build + dependsOn: Windows timeoutInMinutes: 180 strategy: maxParallel: 2 From c413a5626a5d348622efad54611aa610ebec04b2 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 24 Jul 2020 21:03:41 -0500 Subject: [PATCH 4/5] collect console log in renderer tests Print the output finally to ease diagnosing --- script/test | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/script/test b/script/test index 8c66a2ae925..99619102359 100755 --- a/script/test +++ b/script/test @@ -110,9 +110,21 @@ for (let testFile of testFiles) { '--resource-path', resourcePath, '--test', testFile ] - const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) - cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) + const cp = childProcess.spawn(executablePath, testArguments, { env: testEnv}) + let stderrOutput = '' + cp.stderr.on('data', data => { stderrOutput += data }) + cp.stdout.on('data', data => { stderrOutput += data }) + cp.on('error', error => { + console.log(error, "error") + callback(error) + }) + cp.on('close', exitCode => { + if (exitCode !== 0) { + console.log(`##[error] Renderer tests failed for ${testFile}:`.red) + console.log(stderrOutput) + } + callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) + }) }) } From 3bdd637ff28a1a4001cdd5d97193a10059b6e2fa Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 24 Jul 2020 21:03:55 -0500 Subject: [PATCH 5/5] Use async.series Revert b61475ffe420672b3360b50aba7b0f347ea319d4 --- script/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test b/script/test index 99619102359..930828430e5 100755 --- a/script/test +++ b/script/test @@ -281,7 +281,7 @@ function requestedTestSuites (platform) { return suites } -async.parallel(testSuitesToRun, function (err, results) { +async.series(testSuitesToRun, function (err, results) { if (err) { console.error(err) process.exit(1)