Create local_internal_options configuration handler fixture #1835
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
Define default internal_option_configurations for wazuh daemons
juliamagan
requested changes
Sep 6, 2021
tests/integration/conftest.py
Outdated
| @@ -602,3 +602,30 @@ def create_file_structure_function(get_files_list): | |||
| yield | |||
|
|
|||
| delete_file_structure(get_files_list) | |||
|
|
|||
|
|
|||
| @pytest.fixture(scope="module") | |||
There was a problem hiding this comment.
Suggested change
| @pytest.fixture(scope="module") | |
| @pytest.fixture(scope='module') |
tests/integration/conftest.py
Outdated
Comment on lines
623
to
624
| logger.error('Configure Local Internal Options: DEBUG - Set local_internal_option to ' + | ||
| f"{str(local_internal_options)}") |
There was a problem hiding this comment.
This logger lever should be info or debug
tests/integration/conftest.py
Outdated
Comment on lines
629
to
630
| logger.error('Configure Local Internal Options: DEBUG - Restore local_internal_option to ' + | ||
| f"{str(backup_local_internal_options)}") |
|
We can test these changes before the merge in temporal branch: |
…ture Logger of local internal option module fixture change to debug level
jmv74211
suggested changes
Sep 6, 2021
| REMOTED_LOCAL_INTERNAL_OPTIONS = {'remoted.debug': '2', 'wazuh_database.interval': '2', 'wazuh_db.commit_time': '2', | ||
| 'wazuh_db.commit_time_max': '3' }.update(DISABLE_MONITORD_ROTATE_LOG_OPTION) | ||
| VD_LOCAL_INTERNAL_OPTIONS = {'wazuh_modules.debug': '2'}.update(DISABLE_MONITORD_ROTATE_LOG_OPTION) | ||
| WPK_LOCAL_INTERNAL_OPTIONS = {'wazuh_modules.debug': '2'} |
There was a problem hiding this comment.
Fix indentations of this file
tests/integration/conftest.py
Outdated
|
|
||
| backup_local_internal_options = conf.get_local_internal_options_dict() | ||
|
|
||
| logger.error('Configure Local Internal Options: DEBUG - Set local_internal_option to ' + |
There was a problem hiding this comment.
Change this to logger.debug
tests/integration/conftest.py
Outdated
|
|
||
| yield | ||
|
|
||
| logger.error('Configure Local Internal Options: DEBUG - Restore local_internal_option to ' + |
There was a problem hiding this comment.
Change this to logger.debug
jmv74211
approved these changes
Sep 7, 2021
juliamagan
approved these changes
Sep 7, 2021
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.
Description
This PR closes #1829. It adds a common Wazuh
local_internal_optionsconfiguration handler fixture for all integration tests.Usage
In order to use this fixture, it is necessary to define a
local_internal_optionsvariable. This should be a dictionary with the necessary internal options for the test. For example:With this variable defined the fixture will works for each test which calls it.
This fixture is defined for module scope cases. In those tests that changes
local_internal_optionsaccording to a list, it is recommended to use the currently defined fixture.Tests
pycodestyle --max-line-length=120 --show-source --show-pep8 file.py.