TT#81700 bin/check.sh: add info of what sections failed, take two

Change-Id: I89df6f6f41a277161daa596119da15c7e0c1a79b

bin/check.py

@@ -24,7 +24,7 @@ import re
 import argparse
 import json
 import logging
-from enum import IntFlag
+from enum import Flag
 
 from yaml import load
 
@@ -103,7 +103,7 @@ class XAvp:
             raise Exception("no xavp")
 
 
-class Section(IntFlag):
+class Section(Flag):
     FLOW = 2
     FLOW_VARS = 4
     SIP_IN = 8
@@ -116,7 +116,7 @@ class Test:
 
     def __init__(self):
         self._step = []
-        self._errflag = 0
+        self._errflag = Section(0)
 
     def comment(self, msg):
         """ Add a comment """
@@ -129,7 +129,7 @@ class Test:
     def error(self, section, msg_err):
         """ Add an error result"""
         self._step.append({"result": False, "msg_err": msg_err})
-        self._errflag += section
+        self._errflag |= section
 
     @classmethod
     def compare(cls, val0, val1):
@@ -168,10 +168,10 @@ class Test:
         val = {"result": result, "msg_err": msg_err, "msg_ok": msg_ok}
         self._step.append(val)
         if not result:
-            self._errflag += section
+            self._errflag |= section
 
     def isError(self):
-        return self._errflag != 0
+        return self._errflag.value != 0
 
     def _num_tests(self):
         """get the num of tests"""
@@ -356,9 +356,10 @@ def main(args):
     check_sip(Section.SIP_IN, scen["sip_in"], check["sip_in"], test)
     test.comment("check sip_out")
     check_sip_out(Section.SIP_OUT, scen["sip_out"], check["sip_out"], test)
+    test.comment(test._errflag)
     print(test)
     if test.isError():
-        sys.exit(test._errflag)
+        sys.exit(test._errflag.value)
 
 
 if __name__ == "__main__":

bin/check.sh

@@ -64,10 +64,10 @@ echo "$(date) - $(basename "$2") NOT ok"
 function str_check_error() {
   local err_type=()
 
-  [[ $(($1 & 2)) -eq 0 ]] && err_type+=("FLOW")
-  [[ $(($1 & 4)) -eq 0 ]] && err_type+=("FLOW_VARS")
-  [[ $(($1 & 8)) -eq 0 ]] && err_type+=("SIP_IN")
-  [[ $(($1 & 16)) -eq 0 ]] && err_type+=("SIP_OUT")
+  [[ $(($1 & 2)) -eq 2 ]] && err_type+=("FLOW")
+  [[ $(($1 & 4)) -eq 4 ]] && err_type+=("FLOW_VARS")
+  [[ $(($1 & 8)) -eq 8 ]] && err_type+=("SIP_IN")
+  [[ $(($1 & 16)) -eq 16 ]] && err_type+=("SIP_OUT")
 
   echo "${err_type[*]}"
 }

tests/test_check.py

@@ -34,6 +34,23 @@ from check import load_json, load_yaml  # noqa
 not_ok = re.compile("^not ok.*", re.MULTILINE)
 
 
+class TestSection(unittest.TestCase):
+
+    def setUp(self):
+        self.sec = Section(0)
+
+    def test_add(self):
+        self.assertFalse(self.sec & Section.FLOW)
+        self.assertFalse(self.sec & Section.SIP_OUT)
+        self.assertFalse(self.sec & Section.SIP_IN)
+        self.sec |= Section.FLOW
+        self.assertTrue(self.sec & Section.FLOW)
+        self.sec |= Section.SIP_OUT
+        self.assertTrue(self.sec & Section.FLOW)
+        self.assertTrue(self.sec & Section.SIP_OUT)
+        self.assertFalse(self.sec & Section.SIP_IN)
+
+
 class TestXAvp(unittest.TestCase):
     def setUp(self):
         self.name = "test"
@@ -197,6 +214,7 @@ if __name__ == "__main__":
 
     suite = unittest.TestSuite()
     load = unittest.defaultTestLoader.loadTestsFromTestCase
+    suite.addTest(load(TestSection))
     suite.addTest(load(TestXAvp))
     suite.addTest(load(TestCheckFlowVars))
     suite.addTest(load(TestCheckSipIn))