Repository navigation
Commit 491e134
committed
Fix Improper Import Order Breaking fuzz_submodule Fuzzer
ClusterFuzz runs of the `fuzz_submodule` target have been failing
because the `git` import was placed before the condition that sets the
Git executable path.
The order in which `git` is imported matters because it attempts to find
a Git executable as the import is loaded (via `refresh()` in
`git/__init__.py`.) As per #1909, we configure the ClusterFuzz
environment to use a bundled Git executable via the env variable
condition in all fuzz targets.1 parent e51bfdf commit 491e134
1 file changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,12 +4,13 @@ | |||
| 4 | 4 | import tempfile | |
| 5 | 5 | from configparser import ParsingError | |
| 6 | 6 | from utils import is_expected_exception_message, get_max_filename_length | |
| 7 | - from git import Repo, GitCommandError, InvalidGitRepositoryError | ||
| 8 | 7 | ||
| 9 | 8 | if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"): # pragma: no cover | |
| 10 | 9 | path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git")) | |
| 11 | 10 | os.environ["GIT_PYTHON_GIT_EXECUTABLE"] = path_to_bundled_git_binary | |
| 12 | 11 | ||
| 12 | + from git import Repo, GitCommandError, InvalidGitRepositoryError | ||
| 13 | + | ||
| 13 | 14 | if not sys.warnoptions: # pragma: no cover | |
| 14 | 15 | # The warnings filter below can be overridden by passing the -W option | |
| 15 | 16 | # to the Python interpreter command line or setting the `PYTHONWARNINGS` environment variable. | |
0 commit comments