tests: fixing pytest.skip error.

Updated scripts to handle skip on lower
kernel version.

Signed-off-by: naveen <nguggarigoud@vmware.com>

diff --git a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
index b34c001ca26ca1496cc2d34bd39e6f66016349d7..41fa7c0a0950b74d452eb3f71a868ff5e5db97e1 100755 (executable)
--- a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
+++ b/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
@@ -69,7 +69,6 @@ from lib.common_config import (
     create_static_routes,
     verify_rib,
     verify_admin_distance_for_static_routes,
-<<<<<<< ff9ae8fbb8f14b1cf5679d3278341edd09e7d8bf
     check_address_types,
     apply_raw_config,
     addKernelRoute,
@@ -77,9 +76,7 @@ from lib.common_config import (
     create_prefix_lists,
     create_route_maps,
     verify_bgp_community,
-=======
     required_linux_kernel_version
->>>>>>> tests: Moving kernel version check to API.
 )
 from lib.topolog import logger
 from lib.bgp import (
@@ -143,8 +140,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py b/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py
index 63e5a9f9b283bbdf9f35aa2ab6aaa7df9a5db110..6068f5f831dc7e6c4c7d0b7f443cefc7dd072016 100755 (executable)
--- a/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py
+++ b/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py
@@ -111,8 +111,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py b/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py
index 883dc92438f02f2b8705e683e5f4aaeb7c0102d7..ae54019a0fc3fa1ac3286d40db4d26c8505cfbd5 100755 (executable)
--- a/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py
+++ b/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py
@@ -111,8 +111,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py b/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
index 4db4d1a8b9f806069f47b4f991efbb017ea149e9..f9d22a3a3696d5206e31bf4c4a95b91db15eecdc 100755 (executable)
--- a/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
+++ b/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
@@ -115,8 +115,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
index 88c5e0df199d8c8d7b3e4e5f264f21a0d96d9363..57e8e0d34aefdcc717b3359f167eab8b890de32b 100644 (file)
--- a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
+++ b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
@@ -105,8 +105,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1.py b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1.py
index 30757809c4628bdb90eb3de40d2001d90a9c2c93..fdbd3170933eb1592c4db076e1a699bc216ddac5 100755 (executable)
--- a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1.py
+++ b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1.py
@@ -189,8 +189,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2.py b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2.py
index 8bec22c57747206f249adaf0c56ad450049af7b7..e1ec0ea81b205ab833011de51f878a8a67a9e2f8 100755 (executable)
--- a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2.py
+++ b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2.py
@@ -186,8 +186,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     global ADDR_TYPES
 

diff --git a/tests/topotests/bgp_large_community/test_bgp_large_community_topo_1.py b/tests/topotests/bgp_large_community/test_bgp_large_community_topo_1.py
index fe9e8504adadaa12a2ebb20b05288e9a6bbb17dd..dc06b7131a5c336e05b50345132d785d1d501b2f 100755 (executable)
--- a/tests/topotests/bgp_large_community/test_bgp_large_community_topo_1.py
+++ b/tests/topotests/bgp_large_community/test_bgp_large_community_topo_1.py
@@ -145,8 +145,8 @@ def setup_module(mod):
     """
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     global ADDR_TYPES
     testsuite_run_time = time.asctime(time.localtime(time.time()))

diff --git a/tests/topotests/bgp_large_community/test_bgp_large_community_topo_2.py b/tests/topotests/bgp_large_community/test_bgp_large_community_topo_2.py
index d890fe127d37a51f80da445140137e52be430316..bb88e47415d3933bd30b1cc626e78ee34b08045f 100755 (executable)
--- a/tests/topotests/bgp_large_community/test_bgp_large_community_topo_2.py
+++ b/tests/topotests/bgp_large_community/test_bgp_large_community_topo_2.py
@@ -136,8 +136,8 @@ def setup_module(mod):
 
     # Required linux kernel version for this suite to run.
     result = required_linux_kernel_version('4.15')
-    if result:
-        pytest.skip(result)
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_multi_vrf_topo1/test_bgp_multi_vrf_topo1.py b/tests/topotests/bgp_multi_vrf_topo1/test_bgp_multi_vrf_topo1.py
index 6ecc11119fbf24aad3970a0e84da163f81ae6e02..c15b88d37100dfcc791eed966213da73433caebc 100755 (executable)
--- a/tests/topotests/bgp_multi_vrf_topo1/test_bgp_multi_vrf_topo1.py
+++ b/tests/topotests/bgp_multi_vrf_topo1/test_bgp_multi_vrf_topo1.py
@@ -211,9 +211,9 @@ def setup_module(mod):
     * `mod`: module name
     """
     # Required linux kernel version for this suite to run.
-    result = required_linux_kernel_version('4.19')
-    if result:
-        pytest.skip(result)
+    result = required_linux_kernel_version('4.15')
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))

diff --git a/tests/topotests/bgp_multi_vrf_topo2/test_bgp_multi_vrf_topo2.py b/tests/topotests/bgp_multi_vrf_topo2/test_bgp_multi_vrf_topo2.py
index 18c4a5dc757f506ce42c44f5ebdf382ebde16d83..bb13d54019cd4fe2083493d5b848fd2bbfc55c45 100755 (executable)
--- a/tests/topotests/bgp_multi_vrf_topo2/test_bgp_multi_vrf_topo2.py
+++ b/tests/topotests/bgp_multi_vrf_topo2/test_bgp_multi_vrf_topo2.py
@@ -143,9 +143,9 @@ def setup_module(mod):
     * `mod`: module name
     """
     # Required linux kernel version for this suite to run.
-    result = required_linux_kernel_version('4.19')
-    if result:
-        pytest.skip(result)
+    result = required_linux_kernel_version('4.15')
+    if result is not True:
+        pytest.skip("Kernel requirements are not met")
 
     testsuite_run_time = time.asctime(time.localtime(time.time()))
     logger.info("Testsuite start time: {}".format(testsuite_run_time))