Fix unit test import mocking for python3.9 #890
Closed
Conversation
This file contains hidden or 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
Mocks were not effective for in-function local import symbols. This patch moves the imports to the module scope, which fixes the suite for python3.9. Since mlx is not present on Linux, we have to catch ImportError and fall back to Nones for mac-specific imports (which can then be mocked out in unit tests as needed). Closes #814 Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>
|
I would prefer to keep the imports local. It speeds up start-up time of the CLI. Please take a look at |
|
@tiran I will take a look at mock_mlx. Do you have numbers on start-up slowdown? I don't have access to Mac to try it out, so I wonder how impactful this is... |
|
I'm Linux-only, too. I know that llama_cpp and torch imports made huge impact. My PR #674 speeded up |
booxter
pushed a commit
to booxter/instructlab
that referenced
this pull request
Apr 19, 2024
Test code was writing {} in the file but this results in an empty dict()
produced by json.load, which would later fail with KeyError('user') in
make_data.
The reason why this doesn't show up in the test runs is because
make_data is mocked out. This test bug was noticed while working on
another fix for the test suite where mocks were not effective [1].
While the test suite was not failing (because of mocks), it's still
better to inject data that conforms to loader expectations.
[1] instructlab#890
Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>
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.
Which issue is resolved by this Pull Request:
Resolves #814
Description of your changes:
Mocks were not effective for in-function local import symbols.
This patch moves the imports to the module scope, which fixes the suite for python3.9.
Since mlx is not present on Linux, we have to catch ImportError and fall back to Nones for mac-specific imports (which can then be mocked out in unit tests as needed).