diff options
| author |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-10-31 08:34:22 +0000 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-10-31 11:47:10 +0000 |
| commit | b31d39358b42bbe4e7754ea5a3f9c18da08bce18 (patch) | |
| tree | 8ca438ac14f516af021491a6477ff37d7a62192d | |
| parent | 3ad984732961d0a8ec3bd6e68a37a4927275419d (diff) | |
tests: Revert "tests: add sending SIGQUIT to vpp quit sequence"
This reverts commit 4465fe1e30556b40c9ef8a1a155aa1665102dd22.
That commit makes *every* test to send SIGQUIT to VPP when it is done,
thereby triggering the coredump if there was none.
It is most surely not what we want.
Type: test
Change-Id: I3cc4c96f44c05527d586142f8feccc2f93c3e536
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
| -rw-r--r-- | test/framework.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/framework.py b/test/framework.py index 7275d2c7c7d..e3c605b64ac 100644 --- a/test/framework.py +++ b/test/framework.py @@ -474,13 +474,12 @@ class VppTestCase(unittest.TestCase): cls.logger.critical("Couldn't stat : {}".format(cls.stats_sock)) @classmethod - def wait_for_coredump(cls, corefile, wait_time=60): - cls.vpp.send_signal(signal.SIGQUIT) + def wait_for_coredump(cls): + corefile = cls.tempdir + "/core" if os.path.isfile(corefile): - cls.logger.error("Waiting %s sec. for coredump to complete: %s", - (wait_time, corefile)) + cls.logger.error("Waiting for coredump to complete: %s", corefile) curr_size = os.path.getsize(corefile) - deadline = time.time() + wait_time + deadline = time.time() + 60 ok = False while time.time() < deadline: cls.sleep(1) @@ -611,7 +610,7 @@ class VppTestCase(unittest.TestCase): cls.logger.debug("Waiting for pump thread to stop") cls.pump_thread.join() if hasattr(cls, 'vpp_stderr_reader_thread'): - cls.logger.debug("Waiting for stderr pump to stop") + cls.logger.debug("Waiting for stdderr pump to stop") cls.vpp_stderr_reader_thread.join() if hasattr(cls, 'vpp'): @@ -624,7 +623,7 @@ class VppTestCase(unittest.TestCase): del cls.vapi cls.vpp.poll() if cls.vpp.returncode is None: - cls.wait_for_coredump(cls.tempdir + "/core", wait_time=60) + cls.wait_for_coredump() cls.logger.debug("Sending TERM to vpp") cls.vpp.terminate() cls.logger.debug("Waiting for vpp to die") |