Repository navigation
Commit 8bbcb26
committed
Call repo.close() instead of manually collecting
The code this replaces in the `commit` pytest fixture seems not to
be needed anymore, and could arguably be removed now with no
further related changes. But whether it is needed depends on
subtle and sometimes nondeterministic factors, and may also vary
across Python versions.
To be safe, this replaces it with a call to the Repo instance's
close method, which is in effect more robust than what was being
done before, as it calls clear_cache on the the Git object that the
Repo object uses, does a gitdb/smmap collection, and on Windows
calls gc.collect both before and after that collection.
This may happen immediately anyway if the Repo object is not
reachable from any cycle, since the reference count should go to
zero after each of the deprecation warning tests (the fixture's
lifetime is that of the test case), and Repo.close is called in
Repo.__del__. But this makes it happen immediately even if there is
a cycle.1 parent ca385a5 commit 8bbcb26
1 file changed
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,6 @@ | |||
| 4 | 4 | """Tests of assorted deprecation warnings with no extra subtleties to check.""" | |
| 5 | 5 | ||
| 6 | 6 | import contextlib | |
| 7 | - import gc | ||
| 8 | 7 | import warnings | |
| 9 | 8 | ||
| 10 | 9 | import pytest | |
@@ -31,8 +30,7 @@ def commit(tmp_path): | |||
| 31 | 30 | repo = Repo.init(tmp_path) | |
| 32 | 31 | repo.index.add(["a.txt"]) | |
| 33 | 32 | yield repo.index.commit("Initial commit") | |
| 34 | - del repo | ||
| 35 | - gc.collect() | ||
| 33 | + repo.close() | ||
| 36 | 34 | ||
| 37 | 35 | ||
| 38 | 36 | @pytest.fixture | |
0 commit comments