_getconftestmodules: use functools.lru_cache #4247
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Oct 26, 2018
Merged
blueyed
force-pushed
the
lru
branch
4 times, most recently
from
e0728b5 to
216afd7
Compare
|
There's a simple failure related to renaming the private attribute |
|
So the failing test on py27 is testing that we are caching diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
index 20c1e3ec..1124304a 100644
--- a/src/_pytest/config/__init__.py
+++ b/src/_pytest/config/__init__.py
@@ -395,6 +395,11 @@ class PytestPluginManager(PluginManager):
else:
directory = path
+ try:
+ return self._dirpath2confmods[directory]
+ except KeyError:
+ pass
+But it kind of reduces the point of using I guess it is OK to apply the patch above (perhaps inside a |
Also renames `_path2confmods` to `_dirpath2confmods` for clarity (it is expected to be a dirpath in `_importconftest`). Uses an explicit maxsize, since it appears to be only relevant for a short period [1]. Removes the lru_cache on _getconftest_pathlist, which makes no difference when caching _getconftestmodules, at least with the performance test of 100x10 files (pytest-dev#4237). 1: pytest-dev#4237 (comment)
|
Thanks, added it with |
nicoddemus
approved these changes
Oct 31, 2018
Codecov Report
@@ Coverage Diff @@
## features #4247 +/- ##
===========================================
- Coverage 95.83% 92.3% -3.54%
===========================================
Files 111 111
Lines 24777 24769 -8
Branches 2417 2414 -3
===========================================
- Hits 23746 22862 -884
- Misses 734 1512 +778
- Partials 297 395 +98
Continue to review full report at Codecov.
|
|
Codecov on AppVeyor failed to upload, otherwise it is green. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also renames
_path2confmodsto_dirpath2confmodsfor clarity (it isexpected to be a dirpath in
_importconftest).Merges master to avoid conflict with 63691f5 (which should have been done on features probably).