Gareth Jones a0749b5d01 chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

..

categoryFilter-test.js

refactor: fixed a few more appenders

2017-02-07 08:53:51 +11:00

cluster-test.js

fix(#671): fixes serialisation of errors with properties

2018-02-28 08:27:41 +11:00

configuration-test.js

Merge remote-tracking branch 'origin/master' into version-3.x

2018-02-16 07:50:43 +11:00

configuration-validation-test.js

chore: deprecated the gelf appender

2018-02-22 07:52:16 +11:00

connect-logger-test.js

fix(test): all tests passing except server

2018-02-05 07:04:46 +11:00

connect-nolog-test.js

fix(test): all tests passing except server

2018-02-05 07:04:46 +11:00

consoleAppender-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

dateFileAppender-test.js

test(dateFile): fixed a potential test timing issue

2017-11-18 11:02:23 +11:00

default-settings-test.js

fix(test): sandboxed-module -> log4js-node version

2018-02-01 07:56:49 +11:00

disable-cluster-test.js

fix(cluster): add flag to turn off the cluster support

2017-09-25 09:47:03 +10:00

file-sighup-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

fileAppender-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

fileSyncAppender-test.js

feat: Enable maxLogSize with unit

2018-05-04 11:53:09 +08:00

layouts-test.js

fix(#614): bumped deps of debug, date-format, streamroller

2017-11-17 08:47:45 +11:00

levels-before-configure-test.js

fix(#652): access levels before configure is called

2018-01-19 08:10:35 +11:00

levels-test.js

fix(tests): tests failing - config listeners not working in sandbox

2018-01-17 08:24:50 +11:00

log4js.json

fix(test): moved file appender test to tap

2016-12-29 22:57:54 +11:00

logFaces-HTTP-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

logFaces-UDP-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

logger-test.js

fix(test): all tests passing except server

2018-02-05 07:04:46 +11:00

logging-test.js

fix(test): sandboxed-module -> log4js-node version

2018-02-01 07:56:49 +11:00

LoggingEvent-test.js

fix(test): added coverage of serialisation

2018-02-07 08:25:02 +11:00

logLevelFilter-test.js

refactor: fixed a few more tests

2017-02-08 09:10:14 +11:00

logstashHTTP-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

multi-file-appender-test.js

chore: bump up timeout for multi-file timeout test

2018-05-21 07:51:28 +10:00

multiprocess-shutdown-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

multiprocess-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

multiprocess-worker.js

fix(#713): handle unexpected hangups in multiprocess appender

2018-05-16 06:52:01 +02:00

newLevel-test.js

chore(lint): added linting to test files

2017-11-14 08:45:22 +11:00

passenger-test.js

chore(test): added test for passenger clustering

2018-02-08 08:12:50 +11:00

pm2-support-test.js

test(pm2): one more go at making this test work all the time

2017-11-18 11:15:58 +11:00

rabbitmqAppender-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

redisAppender-test.js

chore: resolved conflicts manually

2018-05-30 08:26:32 +10:00

server-test.js

fix(tcp): got server working

2018-02-05 08:54:32 +11:00

setLevel-asymmetry-test.js

fix(logger): logger levels now shared across instances of same category

2017-04-28 08:29:14 +10:00

slackAppender-test.js

fix(test): sandboxed-module -> log4js-node version

2018-02-01 07:56:49 +11:00

smtpAppender-test.js

chore: wrong dep message, test to ignore dep

2018-05-29 08:15:42 +10:00

stacktraces-test.js

fix(#252): stacktraces in different vm context

2017-07-26 08:54:25 +10:00

stderrAppender-test.js

fix(test): sandboxed-module -> log4js-node version

2018-02-01 07:56:49 +11:00

stdoutAppender-test.js

fix(test): sandboxed-module -> log4js-node version

2018-02-01 07:56:49 +11:00

subcategories-test.js

fix(tests): added test to cover setting level on subcategory

2017-06-22 08:19:24 +10:00

tcp-appender-test.js

feat(tcp): initial version of tcp client appender

2017-11-28 08:44:06 +11:00

test-config.json

test(tap): replaced tape with tap, moved loggly test to tap

2016-12-27 08:35:39 +11:00

with-log-rolling.json

fix(test): moved config reload test to tap

2017-01-02 20:47:06 +11:00