Fix bug 843531 - DPF: Access violation when DataSource is incorrectly constructed #1146
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
Codecov Report
@@ Coverage Diff @@
## master #1146 +/- ##
==========================================
+ Coverage 87.32% 87.33% +0.01%
==========================================
Files 81 81
Lines 9221 9225 +4
==========================================
+ Hits 8052 8057 +5
+ Misses 1169 1168 -1 |
PProfizi
approved these changes
Sep 11, 2023
anslpa
reviewed
Sep 14, 2023
tests/test_datasources.py
Outdated
| @@ -61,6 +61,9 @@ def test_print_data_sources(allkindofcomplexity, server_type): | |||
|
|
|||
|
|
|||
| def test_data_sources_from_data_sources(allkindofcomplexity, server_type): | |||
| with pytest.raises(ValueError) as e: | |||
| data_sources_false = dpf.core.DataSources(data_sources="Wrong Input", server=server_type) | |||
| assert "Data source must be gRPC data sources message type" in e | |||
There was a problem hiding this comment.
Minor: if I were you, I would just assert that "gRPC" data sources" substring is contained in the error message.
anslpa
reviewed
Sep 14, 2023
| @@ -77,9 +78,12 @@ def __init__(self, result_path=None, data_sources=None, server=None): | |||
| self._internal_obj = core_api.data_processing_duplicate_object_reference( | |||
| data_sources | |||
| ) | |||
| else: | |||
| elif hasattr(data_sources, "DESCRIPTOR") or isinstance(data_sources, int): | |||
There was a problem hiding this comment.
You could also use if (hasattr(data_sources, "module") and (data_sources.module == 'data_sources_pb2'))
There was a problem hiding this comment.
Note: int is for the case CLayer server, ctypes.c_void_p is returned (which is an int)
anslpa
approved these changes
Sep 14, 2023
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.
No description provided.