mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
2be5ff0c10
Mozlog currently has two implementations. The top level package is based on the logging module and is deprecated. The newer structured logging implementation lives in mozlog.structured. This patch swaps the two, so the top level mozlog module contains the recommended implementation, while mozlog.unstructured contains the old one. --HG-- rename : testing/mozbase/docs/mozlog_structured.rst => testing/mozbase/docs/mozlog.rst rename : testing/mozbase/mozlog/mozlog/structured/commandline.py => testing/mozbase/mozlog/mozlog/commandline.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/__init__.py => testing/mozbase/mozlog/mozlog/formatters/__init__.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/base.py => testing/mozbase/mozlog/mozlog/formatters/base.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/errorsummary.py => testing/mozbase/mozlog/mozlog/formatters/errorsummary.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/html/__init__.py => testing/mozbase/mozlog/mozlog/formatters/html/__init__.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/html/html.py => testing/mozbase/mozlog/mozlog/formatters/html/html.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/html/main.js => testing/mozbase/mozlog/mozlog/formatters/html/main.js rename : testing/mozbase/mozlog/mozlog/structured/formatters/html/style.css => testing/mozbase/mozlog/mozlog/formatters/html/style.css rename : testing/mozbase/mozlog/mozlog/structured/formatters/html/xmlgen.py => testing/mozbase/mozlog/mozlog/formatters/html/xmlgen.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py => testing/mozbase/mozlog/mozlog/formatters/machformatter.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/tbplformatter.py => testing/mozbase/mozlog/mozlog/formatters/tbplformatter.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/unittest.py => testing/mozbase/mozlog/mozlog/formatters/unittest.py rename : testing/mozbase/mozlog/mozlog/structured/formatters/xunit.py => testing/mozbase/mozlog/mozlog/formatters/xunit.py rename : testing/mozbase/mozlog/mozlog/structured/handlers/__init__.py => testing/mozbase/mozlog/mozlog/handlers/__init__.py rename : testing/mozbase/mozlog/mozlog/structured/handlers/base.py => testing/mozbase/mozlog/mozlog/handlers/base.py rename : testing/mozbase/mozlog/mozlog/structured/handlers/bufferhandler.py => testing/mozbase/mozlog/mozlog/handlers/bufferhandler.py rename : testing/mozbase/mozlog/mozlog/structured/handlers/statushandler.py => testing/mozbase/mozlog/mozlog/handlers/statushandler.py rename : testing/mozbase/mozlog/mozlog/structured/logtypes.py => testing/mozbase/mozlog/mozlog/logtypes.py rename : testing/mozbase/mozlog/mozlog/structured/reader.py => testing/mozbase/mozlog/mozlog/reader.py rename : testing/mozbase/mozlog/mozlog/structured/scripts/__init__.py => testing/mozbase/mozlog/mozlog/scripts/__init__.py rename : testing/mozbase/mozlog/mozlog/structured/scripts/format.py => testing/mozbase/mozlog/mozlog/scripts/format.py rename : testing/mozbase/mozlog/mozlog/structured/scripts/logmerge.py => testing/mozbase/mozlog/mozlog/scripts/logmerge.py rename : testing/mozbase/mozlog/mozlog/structured/scripts/unstable.py => testing/mozbase/mozlog/mozlog/scripts/unstable.py rename : testing/mozbase/mozlog/mozlog/structured/stdadapter.py => testing/mozbase/mozlog/mozlog/stdadapter.py rename : testing/mozbase/mozlog/mozlog/structured/structuredlog.py => testing/mozbase/mozlog/mozlog/structuredlog.py rename : testing/mozbase/mozlog/mozlog/logger.py => testing/mozbase/mozlog/mozlog/unstructured/logger.py rename : testing/mozbase/mozlog/mozlog/loggingmixin.py => testing/mozbase/mozlog/mozlog/unstructured/loggingmixin.py rename : testing/mozbase/mozlog/mozlog/loglistener.py => testing/mozbase/mozlog/mozlog/unstructured/loglistener.py extra : commitid : 3JWk75JY4N0 extra : rebase_source : 229bad7a7bf8ead013ce62d128c0896a75cad393
103 lines
3.2 KiB
Python
Executable File
103 lines
3.2 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
"""
|
|
run mozbase tests from a manifest,
|
|
by default https://github.com/mozilla/mozbase/blob/master/test-manifest.ini
|
|
"""
|
|
|
|
import imp
|
|
import manifestparser
|
|
import mozinfo
|
|
import optparse
|
|
import os
|
|
import sys
|
|
import unittest
|
|
|
|
import mozlog
|
|
from moztest.results import TestResultCollection
|
|
from moztest.adapters.unit import StructuredTestRunner
|
|
|
|
here = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
def unittests(path):
|
|
"""return the unittests in a .py file"""
|
|
|
|
path = os.path.abspath(path)
|
|
unittests = []
|
|
assert os.path.exists(path)
|
|
directory = os.path.dirname(path)
|
|
sys.path.insert(0, directory) # insert directory into path for top-level imports
|
|
modname = os.path.splitext(os.path.basename(path))[0]
|
|
module = imp.load_source(modname, path)
|
|
sys.path.pop(0) # remove directory from global path
|
|
loader = unittest.TestLoader()
|
|
suite = loader.loadTestsFromModule(module)
|
|
for test in suite:
|
|
unittests.append(test)
|
|
return unittests
|
|
|
|
def main(args=sys.argv[1:]):
|
|
|
|
# parse command line options
|
|
usage = '%prog [options] manifest.ini <manifest.ini> <...>'
|
|
parser = optparse.OptionParser(usage=usage, description=__doc__)
|
|
parser.add_option('-b', "--binary",
|
|
dest="binary", help="Binary path",
|
|
metavar=None, default=None)
|
|
parser.add_option('--list', dest='list_tests',
|
|
action='store_true', default=False,
|
|
help="list paths of tests to be run")
|
|
mozlog.commandline.add_logging_group(parser)
|
|
options, args = parser.parse_args(args)
|
|
logger = mozlog.commandline.setup_logging("mozbase", options,
|
|
{"tbpl": sys.stdout})
|
|
|
|
# read the manifest
|
|
if args:
|
|
manifests = args
|
|
else:
|
|
manifests = [os.path.join(here, 'test-manifest.ini')]
|
|
missing = []
|
|
for manifest in manifests:
|
|
# ensure manifests exist
|
|
if not os.path.exists(manifest):
|
|
missing.append(manifest)
|
|
assert not missing, 'manifest(s) not found: %s' % ', '.join(missing)
|
|
manifest = manifestparser.TestManifest(manifests=manifests)
|
|
|
|
if options.binary:
|
|
# A specified binary should override the environment variable
|
|
os.environ['BROWSER_PATH'] = options.binary
|
|
|
|
# gather the tests
|
|
tests = manifest.active_tests(disabled=False, **mozinfo.info)
|
|
tests = [test['path'] for test in tests]
|
|
logger.suite_start(tests)
|
|
|
|
if options.list_tests:
|
|
# print test paths
|
|
print '\n'.join(tests)
|
|
sys.exit(0)
|
|
|
|
# create unittests
|
|
unittestlist = []
|
|
for test in tests:
|
|
unittestlist.extend(unittests(test))
|
|
|
|
# run the tests
|
|
suite = unittest.TestSuite(unittestlist)
|
|
runner = StructuredTestRunner(logger=logger)
|
|
unittest_results = runner.run(suite)
|
|
results = TestResultCollection.from_unittest_results(None, unittest_results)
|
|
logger.suite_end()
|
|
|
|
# exit according to results
|
|
sys.exit(1 if results.num_failures else 0)
|
|
|
|
if __name__ == '__main__':
|
|
main()
|