|
@@ -22,28 +22,22 @@
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
#
|
|
#
|
|
|
|
|
|
|
|
+import argparse
|
|
import curses
|
|
import curses
|
|
|
|
+import logging
|
|
|
|
+import logging.handlers
|
|
|
|
+import os
|
|
import socket
|
|
import socket
|
|
|
|
+import subprocess
|
|
import sys
|
|
import sys
|
|
import unittest
|
|
import unittest
|
|
-
|
|
|
|
-test_order = [
|
|
|
|
- 'qubes.tests.events',
|
|
|
|
- 'qubes.tests.vm.init',
|
|
|
|
- 'qubes.tests.vm.qubesvm',
|
|
|
|
- 'qubes.tests.vm.adminvm',
|
|
|
|
- 'qubes.tests.init',
|
|
|
|
-
|
|
|
|
- 'qubes.tests.tools',
|
|
|
|
-]
|
|
|
|
-
|
|
|
|
-sys.path.insert(1, '../../')
|
|
|
|
|
|
+import unittest.signals
|
|
|
|
|
|
import qubes.tests
|
|
import qubes.tests
|
|
|
|
|
|
-class ANSIColor(dict):
|
|
|
|
|
|
+class CursesColor(dict):
|
|
def __init__(self):
|
|
def __init__(self):
|
|
- super(ANSIColor, self).__init__()
|
|
|
|
|
|
+ super(CursesColor, self).__init__()
|
|
try:
|
|
try:
|
|
curses.setupterm()
|
|
curses.setupterm()
|
|
except curses.error:
|
|
except curses.error:
|
|
@@ -67,7 +61,7 @@ class ANSIColor(dict):
|
|
return ''
|
|
return ''
|
|
|
|
|
|
|
|
|
|
-class ANSITestResult(unittest.TestResult):
|
|
|
|
|
|
+class QubesTestResult(unittest.TestResult):
|
|
'''A test result class that can print colourful text results to a stream.
|
|
'''A test result class that can print colourful text results to a stream.
|
|
|
|
|
|
Used by TextTestRunner. This is a lightly rewritten unittest.TextTestResult.
|
|
Used by TextTestRunner. This is a lightly rewritten unittest.TextTestResult.
|
|
@@ -77,15 +71,18 @@ class ANSITestResult(unittest.TestResult):
|
|
separator2 = unittest.TextTestResult.separator2
|
|
separator2 = unittest.TextTestResult.separator2
|
|
|
|
|
|
def __init__(self, stream, descriptions, verbosity):
|
|
def __init__(self, stream, descriptions, verbosity):
|
|
- super(ANSITestResult, self).__init__(stream, descriptions, verbosity)
|
|
|
|
|
|
+ super(QubesTestResult, self).__init__(stream, descriptions, verbosity)
|
|
self.stream = stream
|
|
self.stream = stream
|
|
self.showAll = verbosity > 1 # pylint: disable=invalid-name
|
|
self.showAll = verbosity > 1 # pylint: disable=invalid-name
|
|
self.dots = verbosity == 1
|
|
self.dots = verbosity == 1
|
|
self.descriptions = descriptions
|
|
self.descriptions = descriptions
|
|
|
|
|
|
- self.color = ANSIColor()
|
|
|
|
|
|
+ self.color = CursesColor()
|
|
self.hostname = socket.gethostname()
|
|
self.hostname = socket.gethostname()
|
|
|
|
|
|
|
|
+ self.log = logging.getLogger('qubes.tests')
|
|
|
|
+
|
|
|
|
+
|
|
def _fmtexc(self, err):
|
|
def _fmtexc(self, err):
|
|
if str(err[1]):
|
|
if str(err[1]):
|
|
return '{color[bold]}{}:{color[normal]} {!s}'.format(
|
|
return '{color[bold]}{}:{color[normal]} {!s}'.format(
|
|
@@ -114,7 +111,8 @@ class ANSITestResult(unittest.TestResult):
|
|
return teststr
|
|
return teststr
|
|
|
|
|
|
def startTest(self, test): # pylint: disable=invalid-name
|
|
def startTest(self, test): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).startTest(test)
|
|
|
|
|
|
+ super(QubesTestResult, self).startTest(test)
|
|
|
|
+ test.log.critical('started')
|
|
if self.showAll:
|
|
if self.showAll:
|
|
if not qubes.tests.in_git:
|
|
if not qubes.tests.in_git:
|
|
self.stream.write('{}: '.format(self.hostname))
|
|
self.stream.write('{}: '.format(self.hostname))
|
|
@@ -123,7 +121,8 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addSuccess(self, test): # pylint: disable=invalid-name
|
|
def addSuccess(self, test): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addSuccess(test)
|
|
|
|
|
|
+ super(QubesTestResult, self).addSuccess(test)
|
|
|
|
+ test.log.warning('ok')
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln('{color[green]}ok{color[normal]}'.format(
|
|
self.stream.writeln('{color[green]}ok{color[normal]}'.format(
|
|
color=self.color))
|
|
color=self.color))
|
|
@@ -132,7 +131,9 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addError(self, test, err): # pylint: disable=invalid-name
|
|
def addError(self, test, err): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addError(test, err)
|
|
|
|
|
|
+ super(QubesTestResult, self).addError(test, err)
|
|
|
|
+ test.log.critical('ERROR ({err[0].__name__}: {err[1]!r})'.format(
|
|
|
|
+ err=err))
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln(
|
|
self.stream.writeln(
|
|
'{color[red]}{color[bold]}ERROR{color[normal]} ({})'.format(
|
|
'{color[red]}{color[bold]}ERROR{color[normal]} ({})'.format(
|
|
@@ -144,7 +145,8 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addFailure(self, test, err): # pylint: disable=invalid-name
|
|
def addFailure(self, test, err): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addFailure(test, err)
|
|
|
|
|
|
+ super(QubesTestResult, self).addFailure(test, err)
|
|
|
|
+ test.log.error('FAIL ({err[0].__name__}: {err[1]!r})'.format(err=err))
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln('{color[red]}FAIL{color[normal]}'.format(
|
|
self.stream.writeln('{color[red]}FAIL{color[normal]}'.format(
|
|
color=self.color))
|
|
color=self.color))
|
|
@@ -154,7 +156,8 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addSkip(self, test, reason): # pylint: disable=invalid-name
|
|
def addSkip(self, test, reason): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addSkip(test, reason)
|
|
|
|
|
|
+ super(QubesTestResult, self).addSkip(test, reason)
|
|
|
|
+ test.log.warning('skipped ({})'.format(reason))
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln(
|
|
self.stream.writeln(
|
|
'{color[cyan]}skipped{color[normal]} ({})'.format(
|
|
'{color[cyan]}skipped{color[normal]} ({})'.format(
|
|
@@ -165,7 +168,8 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addExpectedFailure(self, test, err): # pylint: disable=invalid-name
|
|
def addExpectedFailure(self, test, err): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addExpectedFailure(test, err)
|
|
|
|
|
|
+ super(QubesTestResult, self).addExpectedFailure(test, err)
|
|
|
|
+ test.log.warning('expected failure')
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln(
|
|
self.stream.writeln(
|
|
'{color[yellow]}expected failure{color[normal]}'.format(
|
|
'{color[yellow]}expected failure{color[normal]}'.format(
|
|
@@ -176,7 +180,8 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.flush()
|
|
self.stream.flush()
|
|
|
|
|
|
def addUnexpectedSuccess(self, test): # pylint: disable=invalid-name
|
|
def addUnexpectedSuccess(self, test): # pylint: disable=invalid-name
|
|
- super(ANSITestResult, self).addUnexpectedSuccess(test)
|
|
|
|
|
|
+ super(QubesTestResult, self).addUnexpectedSuccess(test)
|
|
|
|
+ test.log.error('unexpected success')
|
|
if self.showAll:
|
|
if self.showAll:
|
|
self.stream.writeln(
|
|
self.stream.writeln(
|
|
'{color[yellow]}{color[bold]}unexpected success'
|
|
'{color[yellow]}{color[bold]}unexpected success'
|
|
@@ -206,6 +211,10 @@ class ANSITestResult(unittest.TestResult):
|
|
self.stream.writeln('%s' % err)
|
|
self.stream.writeln('%s' % err)
|
|
|
|
|
|
|
|
|
|
|
|
+class QubesDNCTestResult(QubesTestResult):
|
|
|
|
+ do_not_clean = True
|
|
|
|
+
|
|
|
|
+
|
|
def demo(verbosity=2):
|
|
def demo(verbosity=2):
|
|
class TC_00_Demo(qubes.tests.QubesTestCase):
|
|
class TC_00_Demo(qubes.tests.QubesTestCase):
|
|
'''Demo class'''
|
|
'''Demo class'''
|
|
@@ -237,19 +246,153 @@ def demo(verbosity=2):
|
|
|
|
|
|
suite = unittest.TestLoader().loadTestsFromTestCase(TC_00_Demo)
|
|
suite = unittest.TestLoader().loadTestsFromTestCase(TC_00_Demo)
|
|
runner = unittest.TextTestRunner(stream=sys.stdout, verbosity=verbosity)
|
|
runner = unittest.TextTestRunner(stream=sys.stdout, verbosity=verbosity)
|
|
- runner.resultclass = ANSITestResult
|
|
|
|
|
|
+ runner.resultclass = QubesTestResult
|
|
return runner.run(suite).wasSuccessful()
|
|
return runner.run(suite).wasSuccessful()
|
|
|
|
|
|
|
|
|
|
|
|
+parser = argparse.ArgumentParser(
|
|
|
|
+ epilog='''When running only specific tests, write their names like in log,
|
|
|
|
+ in format: MODULE+"/"+CLASS+"/"+FUNCTION. MODULE should omit initial
|
|
|
|
+ "qubes.tests.". Example: basic/TC_00_Basic/test_000_create''')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--verbose', '-v',
|
|
|
|
+ action='count',
|
|
|
|
+ help='increase console verbosity level')
|
|
|
|
+parser.add_argument('--quiet', '-q',
|
|
|
|
+ action='count',
|
|
|
|
+ help='decrease console verbosity level')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--list', '-l',
|
|
|
|
+ action='store_true', dest='list',
|
|
|
|
+ help='list all available tests and exit')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--failfast', '-f',
|
|
|
|
+ action='store_true', dest='failfast',
|
|
|
|
+ help='stop on the first fail, error or unexpected success')
|
|
|
|
+parser.add_argument('--no-failfast',
|
|
|
|
+ action='store_false', dest='failfast',
|
|
|
|
+ help='disable --failfast')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--do-not-clean', '--dnc', '-D',
|
|
|
|
+ action='store_true', dest='do_not_clean',
|
|
|
|
+ help='do not execute tearDown on failed tests. Implies --failfast.')
|
|
|
|
+parser.add_argument('--do-clean', '-C',
|
|
|
|
+ action='store_false', dest='do_not_clean',
|
|
|
|
+ help='do execute tearDown even on failed tests.')
|
|
|
|
+
|
|
|
|
+# pylint: disable=protected-access
|
|
|
|
+parser.add_argument('--loglevel', '-L', metavar='LEVEL',
|
|
|
|
+ action='store', choices=tuple(k
|
|
|
|
+ for k in sorted(logging._levelNames.keys(),
|
|
|
|
+ key=lambda x: logging._levelNames[x])
|
|
|
|
+ if isinstance(k, basestring)),
|
|
|
|
+ help='logging level for file and syslog forwarding '
|
|
|
|
+ '(one of: %(choices)s; default: %(default)s)')
|
|
|
|
+# pylint: enable=protected-access
|
|
|
|
+
|
|
|
|
+parser.add_argument('--logfile', '-o', metavar='FILE',
|
|
|
|
+ action='store',
|
|
|
|
+ help='if set, test run will be also logged to file')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--syslog',
|
|
|
|
+ action='store_true', dest='syslog',
|
|
|
|
+ help='reenable logging to syslog')
|
|
|
|
+parser.add_argument('--no-syslog',
|
|
|
|
+ action='store_false', dest='syslog',
|
|
|
|
+ help='disable logging to syslog')
|
|
|
|
+
|
|
|
|
+parser.add_argument('--kmsg', '--very-brave-or-very-stupid',
|
|
|
|
+ action='store_true', dest='kmsg',
|
|
|
|
+ help='log most important things to kernel ring-buffer')
|
|
|
|
+parser.add_argument('--no-kmsg', '--i-am-smarter-than-kay-sievers',
|
|
|
|
+ action='store_false', dest='kmsg',
|
|
|
|
+ help='do not abuse kernel ring-buffer')
|
|
|
|
+
|
|
|
|
+parser.add_argument('names', metavar='TESTNAME',
|
|
|
|
+ action='store', nargs='*',
|
|
|
|
+ help='list of tests to run named like in description '
|
|
|
|
+ '(default: run all tests)')
|
|
|
|
+
|
|
|
|
+parser.set_defaults(
|
|
|
|
+ failfast=False,
|
|
|
|
+ loglevel='DEBUG',
|
|
|
|
+ logfile=None,
|
|
|
|
+ syslog=True,
|
|
|
|
+ kmsg=False,
|
|
|
|
+ verbose=2,
|
|
|
|
+ quiet=0)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+def list_test_cases(suite):
|
|
|
|
+ for test in suite:
|
|
|
|
+ if isinstance(test, unittest.TestSuite):
|
|
|
|
+ #yield from
|
|
|
|
+ for i in list_test_cases(test):
|
|
|
|
+ yield i
|
|
|
|
+ else:
|
|
|
|
+ yield test
|
|
|
|
+
|
|
|
|
+
|
|
def main():
|
|
def main():
|
|
|
|
+ args = parser.parse_args()
|
|
|
|
+
|
|
suite = unittest.TestSuite()
|
|
suite = unittest.TestSuite()
|
|
loader = unittest.TestLoader()
|
|
loader = unittest.TestLoader()
|
|
- for modname in test_order:
|
|
|
|
- suite.addTests(loader.loadTestsFromName(modname))
|
|
|
|
|
|
|
|
- runner = unittest.TextTestRunner(stream=sys.stdout, verbosity=2)
|
|
|
|
- runner.resultclass = ANSITestResult
|
|
|
|
|
|
+ if args.names:
|
|
|
|
+ alltests = loader.loadTestsFromName('qubes.tests')
|
|
|
|
+ for name in args.names:
|
|
|
|
+ suite.addTests(
|
|
|
|
+ [test for test in list_test_cases(alltests)
|
|
|
|
+ if (str(test)+'/').startswith(name.replace('.', '/')+'/')])
|
|
|
|
+ else:
|
|
|
|
+ suite.addTests(loader.loadTestsFromName('qubes.tests'))
|
|
|
|
+
|
|
|
|
+ if args.list:
|
|
|
|
+ for test in list_test_cases(suite):
|
|
|
|
+ print(str(test)) # pylint: disable=superfluous-parens
|
|
|
|
+ return True
|
|
|
|
+
|
|
|
|
+ if args.do_not_clean:
|
|
|
|
+ args.failfast = True
|
|
|
|
+
|
|
|
|
+ logging.root.setLevel(args.loglevel)
|
|
|
|
+
|
|
|
|
+ if args.logfile is not None:
|
|
|
|
+ ha_file = logging.FileHandler(
|
|
|
|
+ os.path.join(os.environ['HOME'], args.logfile))
|
|
|
|
+ ha_file.setFormatter(
|
|
|
|
+ logging.Formatter('%(asctime)s %(name)s[%(process)d]: %(message)s'))
|
|
|
|
+ logging.root.addHandler(ha_file)
|
|
|
|
+
|
|
|
|
+ if args.syslog:
|
|
|
|
+ ha_syslog = logging.handlers.SysLogHandler('/dev/log')
|
|
|
|
+ ha_syslog.setFormatter(
|
|
|
|
+ logging.Formatter('%(name)s[%(process)d]: %(message)s'))
|
|
|
|
+ logging.root.addHandler(ha_syslog)
|
|
|
|
+
|
|
|
|
+ if args.kmsg:
|
|
|
|
+ try:
|
|
|
|
+ subprocess.check_call(('sudo', 'chmod', '666', '/dev/kmsg'))
|
|
|
|
+ except subprocess.CalledProcessError:
|
|
|
|
+ parser.error('could not chmod /dev/kmsg')
|
|
|
|
+ else:
|
|
|
|
+ ha_kmsg = logging.FileHandler('/dev/kmsg', 'w')
|
|
|
|
+ ha_kmsg.setFormatter(
|
|
|
|
+ logging.Formatter('%(name)s[%(process)d]: %(message)s'))
|
|
|
|
+ ha_kmsg.setLevel(logging.CRITICAL)
|
|
|
|
+ logging.root.addHandler(ha_kmsg)
|
|
|
|
+
|
|
|
|
+ runner = unittest.TextTestRunner(stream=sys.stdout,
|
|
|
|
+ verbosity=(args.verbose-args.quiet),
|
|
|
|
+ failfast=args.failfast)
|
|
|
|
+ unittest.signals.installHandler()
|
|
|
|
+
|
|
|
|
+ runner.resultclass = QubesDNCTestResult \
|
|
|
|
+ if args.do_not_clean else QubesTestResult
|
|
|
|
+
|
|
return runner.run(suite).wasSuccessful()
|
|
return runner.run(suite).wasSuccessful()
|
|
|
|
|
|
|
|
+
|
|
if __name__ == '__main__':
|
|
if __name__ == '__main__':
|
|
sys.exit(not main())
|
|
sys.exit(not main())
|