fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeexzeex wants to merge 1 commit into
base:main
Choose a base branch
from
+170 −11
Open

fix: exclude PR-modified tests from the flaky count #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bin/ncu-ci.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
if (this.queue.length === 0) {
return;
}
const aggregator = new FailureAggregator(cli, this.json);
this.json = aggregator.aggregate();
const aggregator = new FailureAggregator(cli, this.json, this.request);
this.json = await aggregator.aggregate();
cli.log('');
cli.separator('Stats');
cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

async aggregate() {
const { argv, cli } = this;
const aggregator = new FailureAggregator(cli, this.json);
this.json = aggregator.aggregate();
const aggregator = new FailureAggregator(cli, this.json, this.request);
this.json = await aggregator.aggregate();
cli.log('');
cli.separator('Stats');
cli.log('');
Expand Down
51 changes: 44 additions & 7 deletions lib/ci/failure_aggregator.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
constructor(cli, data) {
constructor(cli, data, request) {
this.cli = cli;
this.request = request;
this.health = data[0];
this.failures = data.slice(1);
this.aggregates = null;
}

aggregate() {
/**
* Tells whether the pull request that triggered the run also modified the
* test that failed. Such a failure is likely caused by the change itself,
* so it should not count as an independent flaky occurrence.
*/
async isSelfInflicted(failure) {
const { file, source } = failure;
if (!file || !this.request) {
return false;
}

const pr = parsePRFromURL(source);
if (!pr) {
return false;
}

const path = `test/${file}.js`;
try {
for await (const changed of this.request.getPullRequestFiles(pr)) {
if (changed.filename === path) {
return true;
}
}
} catch {
// Not being able to fetch the changed files is not fatal: keep the
// occurrence rather than dropping it on incomplete information.
this.cli.warn(`Could not determine the files changed by ${source}`);
}

return false;
}

async aggregate() {
const groupedByReason = Object.groupBy(this.failures, getHighlight);
const data = [];
for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

// If multiple sub builds of one PR are failed by the same reason,
// we'll only take one of those builds, as that might be a genuine failure
const prs = uniqBy(failures, 'source')
const candidates = uniqBy(failures, 'source');
const selfInflicted = await Promise.all(
candidates.map(failure => this.isSelfInflicted(failure)));
const prs = candidates
.filter((_, index) => !selfInflicted[index])
.map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
.sort((a, b) => a._id - b._id);
const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
}

formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
}

const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
}

display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
}

for (const type of Object.keys(aggregates)) {
Expand Down
122 changes: 122 additions & 0 deletions test/unit/failure_aggregator.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
* Builds a JS test failure as produced by the CI parsers, where `file` is the
* test name reported by the runner and `source` is the pull request that
* triggered the run.
*/
function failure(prid, file, jobid) {
return {
type: 'JS_TEST_FAILURE',
reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
highlight: 0,
file,
source: `https://github.com/nodejs/node/pull/${prid}/`,
upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
builtOn: `test-machine-${jobid}`,
url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
};
}

/**
* Stubs the parts of the request client the aggregator relies on. `changed`
* maps a pull request number to the files it modified.
*/
function requestStub(changed) {
return {
async * getPullRequestFiles({ prid }) {
for (const filename of changed[prid] ?? []) {
yield { filename };
}
}
};
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
it('should not count a failure in a test the pull request modified', async() => {
const request = requestStub({
65113: ['lib/fs.js'],
65233: ['test/ffi/test-ffi-fast-buffer.js']
});

const aggregator = new FailureAggregator(cli, [
health,
failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
], request);

const aggregates = await aggregator.aggregate();
const [entry] = aggregates.JS_TEST_FAILURE;

assert.strictEqual(entry.prs.length, 1);
assert.strictEqual(
entry.prs[0].source,
'https://github.com/nodejs/node/pull/65113/'
);
});

it('should keep failures in tests the pull request left alone', async() => {
const request = requestStub({
65113: ['lib/fs.js'],
65233: ['src/ffi/fast.cc']
});

const aggregator = new FailureAggregator(cli, [
health,
failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
], request);

const aggregates = await aggregator.aggregate();
const [entry] = aggregates.JS_TEST_FAILURE;

assert.strictEqual(entry.prs.length, 2);
});

it('should keep the occurrence when the changed files cannot be fetched', async() => {
const request = {
getPullRequestFiles() {
throw new Error('network is down');
}
};

const aggregator = new FailureAggregator(cli, [
health,
failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
], request);

const aggregates = await aggregator.aggregate();
const [entry] = aggregates.JS_TEST_FAILURE;

assert.strictEqual(entry.prs.length, 1);
});

it('should leave failures without a test file untouched', async() => {
const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

const buildFailure = {
type: 'BUILD_FAILURE',
reason: 'fatal: could not read Username',
highlight: 0,
source: 'https://github.com/nodejs/node/pull/65233/',
upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
builtOn: 'test-machine',
url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
};

const aggregator = new FailureAggregator(
cli, [health, buildFailure], request);

const aggregates = await aggregator.aggregate();
const [entry] = aggregates.BUILD_FAILURE;

assert.strictEqual(entry.prs.length, 1);
});
});
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: exclude PR-modified tests from the flaky count#1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zeexzeex
wants to merge
1
commit into

base:main
Choose a base branch

from


+170

−11

 Open


fix: exclude PR-modified tests from the flaky count
#1171
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bin/ncu-ci.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -460,8 +460,8 @@ class WalkCommand extends CICommand {
 if (this.queue.length === 0) {
 return;
 }
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand DownExpand Up@@ -541,8 +541,8 @@ class DailyCommand extends CICommand {

 async aggregate() {
 const { argv, cli } = this;
 const aggregator = new FailureAggregator(cli, this.json);
 this.json = aggregator.aggregate();
 const aggregator = new FailureAggregator(cli, this.json, this.request);
 this.json = await aggregator.aggregate();
 cli.log('');
 cli.separator('Stats');
 cli.log('');
Expand Down

51 changes: 44 additions & 7 deletions
lib/ci/failure_aggregator.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,47 @@ function uniqBy(array, key) {
}

export class FailureAggregator {
 constructor(cli, data) {
 constructor(cli, data, request) {
 this.cli = cli;
 this.request = request;
 this.health = data[0];
 this.failures = data.slice(1);
 this.aggregates = null;
 }

 aggregate() {
 /**
 * Tells whether the pull request that triggered the run also modified the
 * test that failed. Such a failure is likely caused by the change itself,
 * so it should not count as an independent flaky occurrence.
 */
 async isSelfInflicted(failure) {
 const { file, source } = failure;
 if (!file || !this.request) {
 return false;
 }

 const pr = parsePRFromURL(source);
 if (!pr) {
 return false;
 }

 const path = `test/${file}.js`;
 try {
 for await (const changed of this.request.getPullRequestFiles(pr)) {
 if (changed.filename === path) {
 return true;
 }
 }
 } catch {
 // Not being able to fetch the changed files is not fatal: keep the
 // occurrence rather than dropping it on incomplete information.
 this.cli.warn(`Could not determine the files changed by ${source}`);
 }

 return false;
 }

 async aggregate() {
 const groupedByReason = Object.groupBy(this.failures, getHighlight);
 const data = [];
 for (const reason of Object.keys(groupedByReason).sort()) {
Expand All@@ -37,7 +70,11 @@ export class FailureAggregator {

 // If multiple sub builds of one PR are failed by the same reason,
 // we'll only take one of those builds, as that might be a genuine failure
 const prs = uniqBy(failures, 'source')
 const candidates = uniqBy(failures, 'source');
 const selfInflicted = await Promise.all(
 candidates.map(failure => this.isSelfInflicted(failure)));
 const prs = candidates
 .filter((_, index) => !selfInflicted[index])
 .map(({ source, upstream }) => ({ source, upstream, _id: parseJobFromURL(upstream).jobid }))
 .sort((a, b) => a._id - b._id);
 const machines = uniqBy(
Expand All@@ -57,9 +94,9 @@ export class FailureAggregator {
 }

 formatAsMarkdown() {
let { aggregates } = this;
const { aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before formatAsMarkdown()');
 }

 const last = parseJobFromURL(this.failures[0].upstream);
Expand DownExpand Up@@ -118,9 +155,9 @@ export class FailureAggregator {
 }

 display() {
let { cli, aggregates } = this;
const { cli, aggregates } = this;
 if (!aggregates) {
aggregates = this.aggregates = this.aggregate();
throw new Error('aggregate() must be awaited before display()');
 }

 for (const type of Object.keys(aggregates)) {
Expand Down

122 changes: 122 additions & 0 deletions
test/unit/failure_aggregator.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
import assert from 'node:assert';
import { describe, it } from 'node:test';

import { FailureAggregator } from '../../lib/ci/failure_aggregator.js';

const health = { type: 'health' };

/**
 * Builds a JS test failure as produced by the CI parsers, where `file` is the
 * test name reported by the runner and `source` is the pull request that
 * triggered the run.
 */
function failure(prid, file, jobid) {
 return {
 type: 'JS_TEST_FAILURE',
 reason: `not ok 1 ${file}\n ---\n severity: fail\n`,
 highlight: 0,
 file,
 source: `https://github.com/nodejs/node/pull/${prid}/`,
 upstream: `https://ci.nodejs.org/job/node-test-pull-request/${jobid}/`,
 builtOn: `test-machine-${jobid}`,
 url: `https://ci.nodejs.org/job/node-test-commit/${jobid}/console`
 };
}

/**
 * Stubs the parts of the request client the aggregator relies on. `changed`
 * maps a pull request number to the files it modified.
 */
function requestStub(changed) {
 return {
 async * getPullRequestFiles({ prid }) {
 for (const filename of changed[prid] ?? []) {
 yield { filename };
 }
 }
 };
}

const cli = { warn() {} };

describe('FailureAggregator', () => {
 it('should not count a failure in a test the pull request modified', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['test/ffi/test-ffi-fast-buffer.js']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 assert.strictEqual(
 entry.prs[0].source,
 'https://github.com/nodejs/node/pull/65113/'
 );
 });

 it('should keep failures in tests the pull request left alone', async() => {
 const request = requestStub({
 65113: ['lib/fs.js'],
 65233: ['src/ffi/fast.cc']
 });

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65113, 'ffi/test-ffi-fast-buffer', 75793),
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 2);
 });

 it('should keep the occurrence when the changed files cannot be fetched', async() => {
 const request = {
 getPullRequestFiles() {
 throw new Error('network is down');
 }
 };

 const aggregator = new FailureAggregator(cli, [
 health,
 failure(65233, 'ffi/test-ffi-fast-buffer', 75799)
 ], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.JS_TEST_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });

 it('should leave failures without a test file untouched', async() => {
 const request = requestStub({ 65233: ['test/ffi/test-ffi-fast-buffer.js'] });

 const buildFailure = {
 type: 'BUILD_FAILURE',
 reason: 'fatal: could not read Username',
 highlight: 0,
 source: 'https://github.com/nodejs/node/pull/65233/',
 upstream: 'https://ci.nodejs.org/job/node-test-pull-request/75799/',
 builtOn: 'test-machine',
 url: 'https://ci.nodejs.org/job/node-test-commit/75799/console'
 };

 const aggregator = new FailureAggregator(
 cli, [health, buildFailure], request);

 const aggregates = await aggregator.aggregate();
 const [entry] = aggregates.BUILD_FAILURE;

 assert.strictEqual(entry.prs.length, 1);
 });
});