Remove and replace assert_match with assertRegex

Harmon758 · Harmon758 · commit 99471bb594c3 · 2020-02-16T15:28:45.000-06:00
Also remove no longer used assert_not_none
diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py
@@ -4,7 +4,6 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-import re
 from unittest.mock import patch
 
 from nose.tools import (
@@ -16,16 +15,5 @@
     assert_false        # @UnusedImport
 )
 
-__all__ = ['assert_not_none', 'assert_match',
-           'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',
+__all__ = ['assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',
            'assert_true', 'assert_false']
-
-
-def assert_not_none(actual, msg=None):
-    """verify that item is None"""
-    assert actual is not None, msg
-
-
-def assert_match(pattern, string, msg=None):
-    """verify that the pattern matches the string"""
-    assert_not_none(re.search(pattern, string), msg)
diff --git a/git/test/test_git.py b/git/test/test_git.py
@@ -25,7 +25,6 @@
     raises,
     assert_equal,
     assert_true,
-    assert_match,
     fixture_path
 )
 from git.test.lib import with_rw_directory
@@ -87,7 +86,7 @@ def test_it_transforms_kwargs_into_git_command_arguments(self):
         self.assertEqual({'-s', '-t'}, set(res))
 
     def test_it_executes_git_to_shell_and_returns_result(self):
-        assert_match(r'^git version [\d\.]{2}.*$', self.git.execute(["git", "version"]))
+        self.assertRegex(self.git.execute(["git", "version"]), r'^git version [\d\.]{2}.*$')
 
     def test_it_accepts_stdin(self):
         filename = fixture_path("cat_file_blob")
