Tests for check commit message; fix a typo

Author: siong-chin

main/githooks.py

@@ -764,7 +764,7 @@ def check_commit_msg(message, files):
     does not contain required marker.
 
     '''
-    if re.match(r'$Merge branch \'.+?\' into .+', message):
+    if re.match(r'^Merge branch \'.+?\' into .+', message):
         # Not checking for JIRA in commit message generated by github
         pass
     elif NO_JIRA_MARKER not in message:
@@ -809,6 +809,20 @@ def _test(input, is_jira=True):
         _test('BLD-1234word', False)
 
 
+class TestCheckCommitMessage(unittest.TestCase):
+    def test_various_strings(self):
+        def _test(input, is_good=True):
+            rc = check_commit_msg(input, [])
+            self.assertEqual(rc == 0, is_good)
+        _test('ABC-1234')
+        _test('Some changes for ABC-1234 ticket')
+        _test('Trivail change NO_JIRA')
+        _test("Merge branch 'main' into my_branch")
+        _test("Merge branch 'branch_1' into branch_2")
+        _test('I forgot to add the jira marker!', False)
+        _test('Close but no cigar abc-1234', False)
+
+
 def commit_hook(merge=False):
     retval = 0
     files = get_commit_files()