Skip to content

Commit

Permalink
merge(#1915): merge master into branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Deblintrake09 committed Jan 27, 2023
2 parents c362a8b + ca9a2c7 commit d671b56
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ Release report: TBD

### Changed

- Update FIM test to new FIM DBSync process ([#3280](https://github.com/wazuh/wazuh-qa/pull/2728)) \- (Framework + Tests)
- Update FIM test to new FIM DBSync process ([#2728](https://github.com/wazuh/wazuh-qa/pull/2728)) \- (Framework + Tests)
- Update file_limit and registry_limit tests ([#3280](https://github.com/wazuh/wazuh-qa/pull/3280)) \- (Tests)
- Skip test_large_changes test module ([#3783](https://github.com/wazuh/wazuh-qa/pull/3783)) \- (Tests)
- Update report_changes tests ([#3405](https://github.com/wazuh/wazuh-qa/pull/3405)) \- (Tests)
- Update Authd force_insert tests ([#3379](https://github.com/wazuh/wazuh-qa/pull/3379)) \- (Tests)
- Update cluster logs in reliability tests ([#2772](https://github.com/wazuh/wazuh-qa/pull/2772)) \- (Tests)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def extra_configuration_after_yield():


# Tests

@pytest.mark.skip('Test skipped for flaky behavior, after it is fixed by Issue wazuh/wazuh#3783, it will be unblocked')
@pytest.mark.parametrize('filename, folder, original_size, modified_size', [
('regular_0', testdir, 500, 500),
('regular_1', testdir, 30000, 30000),
Expand Down

0 comments on commit d671b56

Please sign in to comment.