libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

tests: Use logger variable for consistency

Browse source
This commit is contained in:
Richard Hansen 2021-10-30 22:18:42 -04:00
parent 9fbd2e5c3d
commit bea57ff249
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/tests/backend/common.js
View file

@ -17,7 +17,8 @@ exports.baseUrl = null;
exports.httpServer = null; exports.httpServer = null;
exports.logger = log4js.getLogger('test'); exports.logger = log4js.getLogger('test');
const logLevel = exports.logger.level; const logger = exports.logger;
const logLevel = logger.level;
// Mocha doesn't monitor unhandled Promise rejections, so convert them to uncaught exceptions. // Mocha doesn't monitor unhandled Promise rejections, so convert them to uncaught exceptions.
// https://github.com/mochajs/mocha/issues/2640 // https://github.com/mochajs/mocha/issues/2640
@ -34,10 +35,10 @@ exports.init = async function () {
agentPromise = new Promise((resolve) => { agentResolve = resolve; }); agentPromise = new Promise((resolve) => { agentResolve = resolve; });
if (!logLevel.isLessThanOrEqualTo(log4js.levels.DEBUG)) { if (!logLevel.isLessThanOrEqualTo(log4js.levels.DEBUG)) {
exports.logger.warn('Disabling non-test logging for the duration of the test. ' + logger.warn('Disabling non-test logging for the duration of the test. ' +
'To enable non-test logging, change the loglevel setting to DEBUG.'); 'To enable non-test logging, change the loglevel setting to DEBUG.');
log4js.setGlobalLogLevel(log4js.levels.OFF); log4js.setGlobalLogLevel(log4js.levels.OFF);
exports.logger.setLevel(logLevel); logger.setLevel(logLevel);
} }
// Note: This is only a shallow backup. // Note: This is only a shallow backup.
@ -49,7 +50,7 @@ exports.init = async function () {
settings.commitRateLimiting = {duration: 0.001, points: 1e6}; settings.commitRateLimiting = {duration: 0.001, points: 1e6};
exports.httpServer = await server.start(); exports.httpServer = await server.start();
exports.baseUrl = `http://localhost:${exports.httpServer.address().port}`; exports.baseUrl = `http://localhost:${exports.httpServer.address().port}`;
exports.logger.debug(`HTTP server at ${exports.baseUrl}`); logger.debug(`HTTP server at ${exports.baseUrl}`);
// Create a supertest user agent for the HTTP server. // Create a supertest user agent for the HTTP server.
exports.agent = supertest(exports.baseUrl); exports.agent = supertest(exports.baseUrl);
// Speed up authn tests. // Speed up authn tests.