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.

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

Fix regression in win_timezone.get_zone #60830

Merged
merged 3 commits into from
Oct 14, 2021

Conversation

lukasraska
Copy link
Contributor

What does this PR do?

Fixes regression introduced into win_timezone.get_zone which failed to report valid timezone if it begins or ends with one of _,d,s,t,o,f characters.

I've also moved whole unit test for win_timezone to pytest.

What issues does this PR fix or reference?

Fixes: #60829

Previous Behavior

$ c:/salt/salt-call.bat --local timezone.get_zone
local:
    Unknown

New Behavior

$ c:/salt/salt-call.bat --local timezone.get_zone
local:
    Europe/Kiev

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@lukasraska lukasraska requested a review from a team as a code owner September 2, 2021 07:47
@lukasraska lukasraska requested review from waynew and removed request for a team September 2, 2021 07:47
@lukasraska
Copy link
Contributor Author

The lint check failure seem unrelated to my changes:

************* Module salt.engines.junos_syslog
salt/engines/junos_syslog.py:95: [E0611(no-name-in-module), ] No name 'internet' in module 'twisted'
salt/engines/junos_syslog.py:96: [E0611(no-name-in-module), ] No name 'internet' in module 'twisted'

@Ch3LL Ch3LL merged commit 4394388 into saltstack:master Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] win_timezone.get_zone returns Unknown for timezones that begin/end with _/d/s/t/o/f
3 participants