saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/2017.7.9' into 2017.7

Browse source
This commit is contained in:
Pedro Algarvio 2019-03-20 14:10:13 +00:00
commit 973e1cac37
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
tests/support/xmlunit.py
View file

@ -16,8 +16,6 @@
from __future__ import absolute_import
import io
import sys
import time
import inspect
import logging
# Import 3rd-party libs
@ -29,7 +27,6 @@ log = logging.getLogger(__name__)
try:
import xmlrunner.runner
import xmlrunner.result
import xmlrunner.unittest
HAS_XMLRUNNER = True
class _DelegateIO(object):
@ -59,48 +56,9 @@ try:
class _XMLTestResult(xmlrunner.result._XMLTestResult):
def startTest(self, test):
log.debug('>>>>> START >>>>> %s', test.id())
log.debug('>>>>> START >>>>> {0}'.format(test.id()))
# xmlrunner classes are NOT new-style classes
# xmlrunner.result._XMLTestResult.startTest(self, test)
# ----- Re-Implement startTest -------------------------------------------------------------------------->
# The reason being that _XMLTestResult does not like tornado testing wrapping it's test class
# https://gist.github.com/s0undt3ch/9298a69a3492404d89a832de9efb1e68
self.start_time = time.time()
xmlrunner.unittest.TestResult.startTest(self, test)
try:
if getattr(test, '_dt_test', None) is not None:
# doctest.DocTestCase
self.filename = test._dt_test.filename
self.lineno = test._dt_test.lineno
else:
# regular unittest.TestCase?
test_method = getattr(test, test._testMethodName)
test_class = type(test)
# Note: inspect can get confused with decorators, so use class.
self.filename = inspect.getsourcefile(test_class)
# Handle partial and partialmethod objects.
test_method = getattr(test_method, 'func', test_method)
# ----- Code which avoids the inspect tracebacks ------------------------------------------------>
try:
from tornado.testing import _TestMethodWrapper
if isinstance(test_method, _TestMethodWrapper):
test_method = test_method.orig_method
except (ImportError, AttributeError):
pass
# <---- Code which avoids the inspect tracebacks -------------------------------------------------
_, self.lineno = inspect.getsourcelines(test_method)
finally:
pass
if self.showAll:
self.stream.write(' ' + self.getDescription(test))
self.stream.write(" ... ")
self.stream.flush()
# <---- Re-Implement startTest ---------------------------------------------------------------------------
xmlrunner.result._XMLTestResult.startTest(self, test)
if self.buffer:
# Let's override the values of self._stdXXX_buffer
# We want a similar sys.stdXXX file like behaviour
@ -110,7 +68,7 @@ try:
sys.stdout = self._stdout_buffer
def stopTest(self, test):
log.debug('<<<<< END <<<<<<< %s', test.id())
log.debug('<<<<< END <<<<<<< {0}'.format(test.id()))
# xmlrunner classes are NOT new-style classes
return xmlrunner.result._XMLTestResult.stopTest(self, test)