diff --git a/lib/node-repo.js b/lib/node-repo.js index c21210e6..679eca20 100644 --- a/lib/node-repo.js +++ b/lib/node-repo.js @@ -116,7 +116,13 @@ async function getDefaultBranch ({ owner, repo, logger }) { function getCodeOwnersFile (url, { logger }) { return new Promise((resolve, reject) => { https.get(url, (res) => { + res.on('error', (err) => { + logger.error(err, 'Error retrieving OWNERS') + return reject(err) + }) if (res.statusCode !== 200) { + // discard the response body so the socket is released + res.resume() logger.error(`Status code: ${res.statusCode}`, 'Error retrieving OWNERS') return reject(res.statusCode) } @@ -127,7 +133,7 @@ function getCodeOwnersFile (url, { logger }) { res.on('end', () => { return resolve(body) }) - }).on('err', (err) => { + }).on('error', (err) => { logger.error(err, 'Error retrieving OWNERS') return reject(err) }) diff --git a/test/unit/node-repo-owners.test.js b/test/unit/node-repo-owners.test.js index c62f2c08..2fb7acc8 100644 --- a/test/unit/node-repo-owners.test.js +++ b/test/unit/node-repo-owners.test.js @@ -1,4 +1,5 @@ import test from 'node:test' +import { Readable } from 'node:stream' import fetchMock from 'fetch-mock' import nock from 'nock' @@ -169,6 +170,56 @@ test('getCodeOwnersFile fail', async (t) => { scope.done() }) +test('getCodeOwnersFile network error', async (t) => { + const options = { + owner: 'nodejs', + repo: 'node-auto-test-6', + prId: 12347, + logger: { info: () => {}, error: () => {}, debug: () => {}, child: function () { return this } }, + retries: 1, + defaultBranch: 'main', + retryInterval: 10 + } + + const base = 'https://localhost' + const filePath = '/CODEOWNERS' + const url = `${base}${filePath}` + const scope = nock(base) + .get(filePath) + .replyWithError('socket hang up') + + await t.assert.rejects(getCodeOwnersFile(url, options), { message: 'socket hang up' }) + scope.done() +}) + +test('getCodeOwnersFile handles an interrupted error response', async (t) => { + const errors = [] + const options = { + logger: { error: (...args) => errors.push(args) } + } + let sent = false + const response = new Readable({ + read () { + if (sent) return + sent = true + this.push('partial response') + setImmediate(() => this.destroy(new Error('socket hang up'))) + } + }) + const base = 'https://localhost' + const filePath = '/CODEOWNERS' + const scope = nock(base) + .get(filePath) + .reply(500, () => response) + + await t.assert.rejects(getCodeOwnersFile(`${base}${filePath}`, options)) + await new Promise(resolve => setImmediate(resolve)) + + t.assert.strictEqual(errors.length, 2) + t.assert.ok(errors[1][0] instanceof Error) + scope.done() +}) + test('pingOwners success', async (t) => { const options = { owner: 'nodejs',