mirror of https://github.com/nodejs/node.git
test: support writing test output to file
This is a minimal effort to support test output written both to stdout and file in order to get our buildbots understanding test output. PR-URL: https://github.com/iojs/io.js/pull/934 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>pull/810/merge
parent
ed3b057e9f
commit
a7bdce249c
|
@ -29,6 +29,7 @@
|
|||
|
||||
|
||||
import imp
|
||||
import logging
|
||||
import optparse
|
||||
import os
|
||||
import platform
|
||||
|
@ -47,6 +48,8 @@ from os.path import join, dirname, abspath, basename, isdir, exists
|
|||
from datetime import datetime
|
||||
from Queue import Queue, Empty
|
||||
|
||||
logger = logging.getLogger('testrunner')
|
||||
|
||||
VERBOSE = False
|
||||
|
||||
|
||||
|
@ -237,7 +240,7 @@ class DotsProgressIndicator(SimpleProgressIndicator):
|
|||
class TapProgressIndicator(SimpleProgressIndicator):
|
||||
|
||||
def Starting(self):
|
||||
print '1..%i' % len(self.cases)
|
||||
logger.info('1..%i' % len(self.cases))
|
||||
self._done = 0
|
||||
|
||||
def AboutToRun(self, case):
|
||||
|
@ -247,13 +250,13 @@ class TapProgressIndicator(SimpleProgressIndicator):
|
|||
self._done += 1
|
||||
command = basename(output.command[-1])
|
||||
if output.UnexpectedOutput():
|
||||
print 'not ok %i - %s' % (self._done, command)
|
||||
logger.info('not ok %i - %s' % (self._done, command))
|
||||
for l in output.output.stderr.splitlines():
|
||||
print '#' + l
|
||||
logger.info('#' + l)
|
||||
for l in output.output.stdout.splitlines():
|
||||
print '#' + l
|
||||
logger.info('#' + l)
|
||||
else:
|
||||
print 'ok %i - %s' % (self._done, command)
|
||||
logger.info('ok %i - %s' % (self._done, command))
|
||||
|
||||
duration = output.test.duration
|
||||
|
||||
|
@ -261,9 +264,9 @@ class TapProgressIndicator(SimpleProgressIndicator):
|
|||
total_seconds = (duration.microseconds +
|
||||
(duration.seconds + duration.days * 24 * 3600) * 10**6) / 10**6
|
||||
|
||||
print ' ---'
|
||||
print ' duration_ms: %d.%d' % (total_seconds, duration.microseconds / 1000)
|
||||
print ' ...'
|
||||
logger.info(' ---')
|
||||
logger.info(' duration_ms: %d.%d' % (total_seconds, duration.microseconds / 1000))
|
||||
logger.info(' ...')
|
||||
|
||||
def Done(self):
|
||||
pass
|
||||
|
@ -1216,6 +1219,8 @@ def BuildOptions():
|
|||
default='release')
|
||||
result.add_option("-v", "--verbose", help="Verbose output",
|
||||
default=False, action="store_true")
|
||||
result.add_option('--logfile', dest='logfile',
|
||||
help='write test output to file. NOTE: this only applies the tap progress indicator')
|
||||
result.add_option("-S", dest="scons_flags", help="Flag to pass through to scons",
|
||||
default=[], action="append")
|
||||
result.add_option("-p", "--progress",
|
||||
|
@ -1359,6 +1364,13 @@ def Main():
|
|||
parser.print_help()
|
||||
return 1
|
||||
|
||||
ch = logging.StreamHandler(sys.stdout)
|
||||
logger.addHandler(ch)
|
||||
logger.setLevel('INFO')
|
||||
if options.logfile:
|
||||
fh = logging.FileHandler(options.logfile)
|
||||
logger.addHandler(fh)
|
||||
|
||||
workspace = abspath(join(dirname(sys.argv[0]), '..'))
|
||||
suites = GetSuites(join(workspace, 'test'))
|
||||
repositories = [TestRepository(join(workspace, 'test', name)) for name in suites]
|
||||
|
|
Loading…
Reference in New Issue