MT#14967 fix check.py TAP output

script was returning error but the TAP was not showing any error

Change-Id: I13e44e09cc63c54ed9e67bfb550cad717d10815d

bin/check.py

@@ -127,7 +127,10 @@ class Test:
                       (type(val0), unicode(val0), type(val1),
                        unicode(val1)))
         if isinstance(val0, basestring):
-            result = re.search(val0, str(val1))
+            if re.search(val0, str(val1)) is not None:
+                return True
+            else:
+                return False
         elif isinstance(val0, int):
             try:
                 result = (val0 == int(val1))

tests/fixtures/scen_fail.yml

@@ -0,0 +1,82 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_INVITE:
+  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_FIND_CALLER:
+  - start|ROUTE_AUTH:
+  - start|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
+  - start|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
+  - start|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
+  - start|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_BLOCK_OUT:
+      $xavp(caller_usr_prefs[0]=>block_out_list[*]): ['4311001', '4311003']
+      $xavp(caller_real_prefs[0]=>block_out_list[*]): ['4311001', '4311003']
+  - start|ROUTE_ACC_FAILURE:
+  - start|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
+  - start|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
+  - start|ROUTE_EARLY_REJECT:
+  - start|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - 'start|dialog:failed':
+  - 'return|dialog:failed':
+  - 'return|dialog:failed':
+  - exit|ROUTE_EARLY_REJECT:
+sip_in:
+  - '^INVITE'
+  - 'Contact: sip:testuser1002@'
+  - 'CSeq: 2 INVITE'
+  - 'Max-Forwards: 69'
+  - 'Content-Type: application/sdp'
+  - 'Proxy-Authorization: Digest username="testuser1002"'
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@'
+    ]
+  - [
+      '^SIP/2.0 101 Connecting',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@'
+    ]
+  - [
+      '^SIP/2.0 403 Blocked by Caller',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@'
+    ]

tests/test_check.py

@@ -22,12 +22,14 @@ import os
 import sys
 import unittest
 import xmlrunner
-import yaml
+import re
 lib_path = os.path.abspath('bin')
 sys.path.append(lib_path)
 from check import check_sip, check_sip_out
 from check import XAvp, Test, check_flow, check_flow_vars
+from check import load_json, load_yaml
 
+not_ok = re.compile('^not ok.*', re.MULTILINE)
 
 class TestXAvp(unittest.TestCase):
 
@@ -90,6 +92,12 @@ class TestCheckFlowVars(unittest.TestCase):
                     }},
             {'R1': {'$xavp(v0)': [{'k0': [1, 2]}]}},
         ]
+        self.check_ko = [
+            {'R0': {'$xavp(v0)': [{'k0': ['a', 'b']}] }},
+        ]
+        self.scen_ko = [
+            {'R0': {'$xavp(v0[0]=>k0[*])': ['a']}},
+        ]
         self.scen_noxavp = [
             {'R0': {'fU': 'testpep'}},
             {'R1': {}},
@@ -101,7 +109,9 @@ class TestCheckFlowVars(unittest.TestCase):
                     '$var(no)': 'None',
                     '$xavp(nono=>koko)': 'None',
                     '$xavp(v0=>k10)': 'None',
-                    '$xavp(v0[1]=>k0[1])': '\d+'}
+                    '$xavp(v0[1]=>k0[1])': '\d+',
+                    '$xavp(v0[0]=>k1[*])': [1],
+                    '$xavp(v0[0]=>k1[*])': ['a', 'b', 'fuckthisshit']}
              },
             {'R1': {'$xavp(v0[1]=>k0[0])': 1}},
         ]
@@ -112,7 +122,7 @@ class TestCheckFlowVars(unittest.TestCase):
 
         self.assertEqual(xavp.get('$xavp(v0=>k0)'), 1)
         self.assertEqual(
-            xavp.get('$xavp(v0=>k1[*])'), ['a', 'b', 'fuckthisshit'])
+            xavp.get('$xavp(v0[0]=>k1[*])'), ['a', 'b', 'fuckthisshit'])
         self.assertEqual(xavp.get('$xavp(v0[1]=>k0[1])'), 2)
         self.assertEqual(xavp.get('$xavp(v0[1]=>k1[*])'), ['a'])
 
@@ -124,16 +134,28 @@ class TestCheckFlowVars(unittest.TestCase):
         check_flow_vars(
             'RO', self.scen_noxavp[0]['R0'],
             self.check_ok[0]['R0'], self.ctest)
-        # print self.ctest
         self.assertFalse(self.ctest.isError())
 
     def testFlowVars_xavp(self):
         check_flow_vars(
             'RO', self.scen[0]['R0'],
             self.check_ok[0]['R0'], self.ctest)
-        # print self.ctest
         self.assertFalse(self.ctest.isError())
 
+    def testFlow_fail(self):
+        check_flow(self.scen_ko, self.check_ko, self.ctest)
+        tap = str(self.ctest)
+        self.assertTrue(self.ctest.isError(), tap)
+        self.assertIsNotNone(not_ok.search(tap), tap)
+
+    def testFlowVars_fail(self):
+        check_flow_vars(
+            'RO', self.scen_ko[0]['R0'],
+            self.check_ko[0]['R0'], self.ctest)
+        tap = str(self.ctest)
+        self.assertTrue(self.ctest.isError(), tap)
+        self.assertIsNotNone(not_ok.search(tap), tap)
+
 
 class TestCheckSipIn(unittest.TestCase):
 
@@ -142,9 +164,8 @@ class TestCheckSipIn(unittest.TestCase):
         self.msg = open('./tests/fixtures/sip_in.txt', 'r').read()
 
     def testSipIn(self):
-        sip_in = yaml.load(open('./tests/fixtures/test_sip_in.yml', 'r'))
+        sip_in = load_yaml('./tests/fixtures/test_sip_in.yml')
         check_sip(sip_in, self.msg, self.ctest)
-        # print self.ctest
         self.assertFalse(self.ctest.isError())
 
 
@@ -152,14 +173,28 @@ class TestCheckSipOut(unittest.TestCase):
 
     def setUp(self):
         self.ctest = Test()
-        self.msg = yaml.load(open('./tests/fixtures/sip_out.yml', 'r'))
+        self.msg = load_yaml('./tests/fixtures/sip_out.yml')
 
     def testSipOut(self):
-        sip_out = yaml.load(open('./tests/fixtures/test_sip_out.yml', 'r'))
+        sip_out = load_yaml('./tests/fixtures/test_sip_out.yml')
         check_sip_out(sip_out, self.msg, self.ctest)
-        # print self.ctest
         self.assertFalse(self.ctest.isError())
 
+
+class TestJson(unittest.TestCase):
+
+    def setUp(self):
+        self.ctest = Test()
+
+    def testFail(self):
+        check = load_json('./tests/fixtures/fail.json')
+        scen = load_yaml('./tests/fixtures/scen_fail.yml')
+        check_flow(scen['flow'], check['flow'], self.ctest)
+        tap = str(self.ctest)
+        self.assertTrue(self.ctest.isError(), tap)
+        self.assertIsNotNone(not_ok.search(tap), tap)
+
+
 if __name__ == '__main__':
     unittest.main(
         testRunner=xmlrunner.XMLTestRunner(output=sys.stdout),