Commit 99471bb

committed

Remove and replace assert_match with assertRegex

Also remove no longer used assert_not_none

1 parent 45a5495 commit 99471bbCopy full SHA for 99471bb

File tree

-15

lines changed

-15

lines changed

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`# This module is part of GitPython and is released under`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
`6`	`6`
`7`		`-import re`
`8`	`7`	`from unittest.mock import patch`
`9`	`8`
`10`	`9`	`from nose.tools import (`
`@@ -16,16 +15,5 @@`
`16`	`15`	`assert_false # @UnusedImport`
`17`	`16`	`)`
`18`	`17`
`19`		`-__all__ = ['assert_not_none', 'assert_match',`
`20`		`- 'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',`
	`18`	`+__all__ = ['assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',`
`21`	`19`	`'assert_true', 'assert_false']`
`22`		`-`
`23`		`-`
`24`		`-def assert_not_none(actual, msg=None):`
`25`		`- """verify that item is None"""`
`26`		`- assert actual is not None, msg`
`27`		`-`
`28`		`-`
`29`		`-def assert_match(pattern, string, msg=None):`
`30`		`- """verify that the pattern matches the string"""`
`31`		`- assert_not_none(re.search(pattern, string), msg)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`raises,`
`26`	`26`	`assert_equal,`
`27`	`27`	`assert_true,`
`28`		`- assert_match,`
`29`	`28`	`fixture_path`
`30`	`29`	`)`
`31`	`30`	`from git.test.lib import with_rw_directory`
`@@ -87,7 +86,7 @@ def test_it_transforms_kwargs_into_git_command_arguments(self):`
`87`	`86`	`self.assertEqual({'-s', '-t'}, set(res))`
`88`	`87`
`89`	`88`	`def test_it_executes_git_to_shell_and_returns_result(self):`
`90`		`- assert_match(r'^git version [\d\.]{2}.*$', self.git.execute(["git", "version"]))`
	`89`	`+ self.assertRegex(self.git.execute(["git", "version"]), r'^git version [\d\.]{2}.*$')`
`91`	`90`
`92`	`91`	`def test_it_accepts_stdin(self):`
`93`	`92`	`filename = fixture_path("cat_file_blob")`

Comments

(0)