Merge pull request #8180 from kuldeepkash/topojson_framework

tests: Improve error/assert message logging

1 files changed, 16 insertions, 14 deletions

diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py
index 0dedc8f0df..cebe55b39c 100644
--- a/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py
+++ b/tests/topotests/ospf_basic_functionality/test_ospf_chaos.py
@@ -249,16 +249,17 @@ def test_ospf_chaos_tc31_p1(request):
     dut = "r1"
     protocol = "ospf"
     result = verify_ospf_rib(tgen, dut, input_dict, expected=False)
-    assert result is not True, "Testcase {} : Failed \n Error: {}".format(
+    assert result is not True, ("Testcase {} : Failed \n "
+        "r1: OSPF routes are present \n Error: {}".format(
         tc_name, result
-    )
+    ))
 
-    result = verify_rib(
-        tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False
-    )
-    assert result is not True, "Testcase {} : Failed \n Error: {}".format(
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol,
+        expected=False)
+    assert result is not True, ("Testcase {} : Failed \n "
+        "r1: routes are still present \n Error: {}".format(
         tc_name, result
-    )
+    ))
 
     step("Bring up OSPFd daemon on R0.")
     start_router_daemons(tgen, "r0", ["ospfd"])
@@ -481,16 +482,17 @@ def test_ospf_chaos_tc34_p1(request):
     dut = "r1"
     protocol = "ospf"
     result = verify_ospf_rib(tgen, dut, input_dict, expected=False)
-    assert result is not True, "Testcase {} : Failed \n Error: {}".format(
+    assert result is not True, ("Testcase {} : Failed \n "
+        "r1: OSPF routes are present \n Error: {}".format(
         tc_name, result
-    )
+    ))
 
-    result = verify_rib(
-        tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False
-    )
-    assert result is not True, "Testcase {} : Failed \n Error: {}".format(
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol,
+            expected=False)
+    assert result is not True, ("Testcase {} : Failed \n "
+        "r1: routes are still present \n Error: {}".format(
         tc_name, result
-    )
+    ))
 
     step("Bring up staticd daemon on R0.")
     start_router_daemons(tgen, "r0", ["staticd"])