diff --git a/test/test_git.py b/test/test_git.py index 1148ccfd8..b02a92b0f 100644 --- a/test/test_git.py +++ b/test/test_git.py @@ -327,7 +327,7 @@ def test_git_exc_name_is_git(self): def test_cmd_override(self): """Directly set bad GIT_PYTHON_GIT_EXECUTABLE causes git operations to raise.""" bad_path = osp.join("some", "path", "which", "doesn't", "exist", "gitbinary") - with mock.patch.object(type(self.git), "GIT_PYTHON_GIT_EXECUTABLE", bad_path): + with mock.patch.object(Git, "GIT_PYTHON_GIT_EXECUTABLE", bad_path): with self.assertRaises(GitCommandNotFound) as ctx: self.git.version() self.assertEqual(ctx.exception.command, [bad_path, "version"]) @@ -341,7 +341,7 @@ def test_initial_refresh_from_bad_git_path_env_quiet(self, case): "GIT_PYTHON_REFRESH": mode, } with _rollback_refresh(): - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. + Git.GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. with mock.patch.dict(os.environ, set_vars): refresh() @@ -356,7 +356,7 @@ def test_initial_refresh_from_bad_git_path_env_warn(self, case): "GIT_PYTHON_REFRESH": mode, } with _rollback_refresh(): - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. + Git.GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. with mock.patch.dict(os.environ, env_vars): with self.assertLogs(cmd.__name__, logging.CRITICAL) as ctx: @@ -375,7 +375,7 @@ def test_initial_refresh_from_bad_git_path_env_error(self, case): "GIT_PYTHON_REFRESH": mode, } with _rollback_refresh(): - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. + Git.GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. with mock.patch.dict(os.environ, env_vars): with self.assertRaisesRegex(ImportError, r"\ABad git executable.\n"): @@ -386,7 +386,7 @@ def test_initial_refresh_from_good_absolute_git_path_env(self): absolute_path = shutil.which("git") with _rollback_refresh(): - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. + Git.GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. with mock.patch.dict(os.environ, {"GIT_PYTHON_GIT_EXECUTABLE": absolute_path}): refresh() @@ -397,8 +397,8 @@ def test_initial_refresh_from_good_relative_git_path_env(self): with _rollback_refresh(): # Set the fallback to a string that wouldn't work and isn't "git", so we are # more likely to detect if "git" is not set from the environment variable. - with mock.patch.object(type(self.git), "git_exec_name", ""): - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. + with mock.patch.object(Git, "git_exec_name", ""): + Git.GIT_PYTHON_GIT_EXECUTABLE = None # Simulate startup. # Now observe if setting the environment variable to "git" takes effect. with mock.patch.dict(os.environ, {"GIT_PYTHON_GIT_EXECUTABLE": "git"}): @@ -442,7 +442,7 @@ def test_refresh_from_good_relative_git_path_env(self): """Good relative path from environment is kept relative and set.""" with _rollback_refresh(): # Set as the executable name a string that wouldn't work and isn't "git". - type(self.git).GIT_PYTHON_GIT_EXECUTABLE = "" + Git.GIT_PYTHON_GIT_EXECUTABLE = "" # Now observe if setting the environment variable to "git" takes effect. with mock.patch.dict(os.environ, {"GIT_PYTHON_GIT_EXECUTABLE": "git"}):