tests: fix test cov for PG Stream and Session SDL

Type: test

Localized cli response waiting time configuration only for
test_pg_stream and test_session_sdl instead of asfframework conf

Change-Id: Iabeccdda97e518662f1243edd91217c02cdc8711
Signed-off-by: Ivan Ivanets <[email protected]>

diff --git a/test/asf/asfframework.py b/test/asf/asfframework.py
index 8e565d2..7670a07 100644 (file)
--- a/test/asf/asfframework.py
+++ b/test/asf/asfframework.py
@@ -652,8 +652,6 @@ class VppAsfTestCase(CPUInterface, unittest.TestCase):
                 cls.pump_thread.start()
             if cls.debug_gdb or cls.debug_gdbserver or cls.debug_attach:
                 cls.vapi_response_timeout = 0
-            elif config.gcov:
-                cls.vapi_response_timeout = 20
             cls.vapi = VppPapiProvider(cls.__name__, cls, cls.vapi_response_timeout)
             if cls.step:
                 hook = hookmodule.StepHook(cls)

diff --git a/test/asf/test_session_sdl.py b/test/asf/test_session_sdl.py
index 53301f7..d2e30da 100644 (file)
--- a/test/asf/test_session_sdl.py
+++ b/test/asf/test_session_sdl.py
@@ -5,6 +5,7 @@ import unittest
 from framework import VppTestCase
 from asfframework import VppTestRunner, tag_fixme_vpp_workers
 from ipaddress import IPv4Network, IPv6Network
+from config import config
 
 from vpp_ip_route import (
     VppIpRoute,
@@ -25,6 +26,10 @@ class TestSessionSDL(VppTestCase):
 
     @classmethod
     def setUpClass(cls):
+        # increase vapi timeout, to avoid
+        # failures reported on test-cov
+        if config.gcov:
+            cls.vapi_response_timeout = 20
         super(TestSessionSDL, cls).setUpClass()
 
     @classmethod

diff --git a/test/test_pg_stream.py b/test/test_pg_stream.py
index 471c85c..915a5aa 100644 (file)
--- a/test/test_pg_stream.py
+++ b/test/test_pg_stream.py
@@ -11,6 +11,7 @@ from scapy.layers.inet6 import IPv6
 
 from framework import VppTestCase
 from asfframework import VppTestRunner
+from config import config
 
 
 class TestPgStream(VppTestCase):
@@ -19,6 +20,18 @@ class TestPgStream(VppTestCase):
     def __init__(self, *args):
         VppTestCase.__init__(self, *args)
 
+    @classmethod
+    def setUpClass(cls):
+        # increase vapi timeout, to avoid
+        # failures reported on test-cov
+        if config.gcov:
+            cls.vapi_response_timeout = 20
+        super(TestPgStream, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestPgStream, cls).tearDownClass()
+
     def setUp(self):
         super(TestPgStream, self).setUp()