Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip xfailed integration tests for gcloud #3531

Merged
merged 4 commits into from
Nov 3, 2022
Merged

Skip xfailed integration tests for gcloud #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30b11f4
refactor(#3428): skip test due to wazuh/wazuh issue 15255
fedepacher Oct 28, 2022
70e5dbe
refactor(#3428): refactor code style
fedepacher Oct 31, 2022
1cacc18
refactor(#3428): add changelog comment
fedepacher Oct 31, 2022
ec4459e
merge: 4.4 into 3428-test-gcloud-4-4
jmv74211 Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Release report: TBD

### Changed

- Skip unstable integration tests for gcloud ([#3531](https:/wazuh/wazuh-qa/pull/3531)) \- (Tests)
- Skip unstable integration test for agentd ([#3538](https:/wazuh/wazuh-qa/pull/3538))
- Update wazuhdb_getconfig and EPS limit integration tests ([#3146](https:/wazuh/wazuh-qa/pull/3146)) \- (Tests)
- Refactor: logcollector `test_only_future_events` according to new standard. ([3484](https:/wazuh/wazuh-qa/pull/3484)) \- (Framework + Tests)
Expand Down
11 changes: 7 additions & 4 deletions tests/integration/test_gcloud/test_functionality/test_day_wday.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
day = today.day

weekDays = ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday")
monthDays = {"1": 31, "2": 28, "3": 31, "4": 30, "5": 31, "6": 30, "7": 31, "8": 31, "9": 30, "10": 31, "11": 30, "12": 31}
monthDays = {"1": 31, "2": 28, "3": 31, "4": 30, "5": 31, "6": 30, "7": 31, "8": 31, "9": 30, "10": 31, "11": 30,
"12": 31}
wday = weekDays[today.weekday()]

now = datetime.datetime.now()
Expand Down Expand Up @@ -125,7 +126,8 @@ def get_configuration(request):
({'ossec_time_conf'})
])
@pytest.mark.skipif(sys.platform == "win32", reason="Windows does not have support for Google Cloud integration.")
def test_day_wday(tags_to_apply, get_configuration, configure_environment, reset_ossec_log, daemons_handler, wait_for_gcp_start):
def test_day_wday(tags_to_apply, get_configuration, configure_environment, reset_ossec_log, daemons_handler,
wait_for_gcp_start):
'''
description: Check if the 'gcp-pubsub' module starts to pull logs according to the day of the week,
of the month, or time set in the configuration. For this purpose, the test will use
Expand Down Expand Up @@ -199,9 +201,10 @@ def get_next_scan(next_scan_time: str):
({'ossec_wday_multiple_conf'}),
({'ossec_time_multiple_conf'})
])

@pytest.mark.xfail(reason="Blocked by wazuh/wazuh#15255")
@pytest.mark.skipif(sys.platform == "win32", reason="Windows does not have support for Google Cloud integration.")
def test_day_wday_multiple(tags_to_apply, get_configuration, configure_environment, reset_ossec_log, daemons_handler, wait_for_gcp_start):
def test_day_wday_multiple(tags_to_apply, get_configuration, configure_environment, reset_ossec_log, daemons_handler,
wait_for_gcp_start):
'''
description: Check if the 'gcp-pubsub' module calculates the next scan correctly using time intervals
greater than one month, one week, or one day. For this purpose, the test will use different
Expand Down