Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix test logging propagation
[vpp.git]
/
test
/
framework.py
diff --git
a/test/framework.py
b/test/framework.py
index
3201e63
..
4f830ba
100644
(file)
--- a/
test/framework.py
+++ b/
test/framework.py
@@
-151,6
+151,7
@@
class KeepAliveReporter(object):
def __init__(self):
self.__dict__ = self._shared_state
def __init__(self):
self.__dict__ = self._shared_state
+ self._pipe = None
@property
def pipe(self):
@property
def pipe(self):
@@
-158,7
+159,7
@@
class KeepAliveReporter(object):
@pipe.setter
def pipe(self, pipe):
@pipe.setter
def pipe(self, pipe):
- if
hasattr(self, '_pipe')
:
+ if
self._pipe is not None
:
raise Exception("Internal error - pipe should only be set once.")
self._pipe = pipe
raise Exception("Internal error - pipe should only be set once.")
self._pipe = pipe
@@
-356,9
+357,15
@@
class VppTestCase(unittest.TestCase):
@classmethod
def wait_for_stats_socket(cls):
deadline = time.time() + 3
@classmethod
def wait_for_stats_socket(cls):
deadline = time.time() + 3
- while time.time() < deadline or cls.debug_gdb or cls.debug_gdbserver:
+ ok = False
+ while time.time() < deadline or \
+ cls.debug_gdb or cls.debug_gdbserver:
if os.path.exists(cls.stats_sock):
if os.path.exists(cls.stats_sock):
+ ok = True
break
break
+ time.sleep(0.8)
+ if not ok:
+ cls.logger.critical("Couldn't stat : {}".format(cls.stats_sock))
@classmethod
def setUpClass(cls):
@classmethod
def setUpClass(cls):
@@
-372,6
+379,7
@@
class VppTestCase(unittest.TestCase):
cls.logger = get_logger(cls.__name__)
if hasattr(cls, 'parallel_handler'):
cls.logger.addHandler(cls.parallel_handler)
cls.logger = get_logger(cls.__name__)
if hasattr(cls, 'parallel_handler'):
cls.logger.addHandler(cls.parallel_handler)
+ cls.logger.propagate = False
cls.tempdir = tempfile.mkdtemp(
prefix='vpp-unittest-%s-' % cls.__name__)
cls.stats_sock = "%s/stats.sock" % cls.tempdir
cls.tempdir = tempfile.mkdtemp(
prefix='vpp-unittest-%s-' % cls.__name__)
cls.stats_sock = "%s/stats.sock" % cls.tempdir