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 issue 29191: only try partial matches when a wildcard has been sp… #29192

Merged
merged 2 commits into from Nov 25, 2015

Conversation

Projects
None yet
4 participants
@bastiaanb
Contributor

bastiaanb commented Nov 25, 2015

…ecified

Show outdated Hide outdated tests/unit/utils/utils_test.py Outdated
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 25, 2015

Contributor

@bastiaanb Thanks for this. There is one small lint issue that I commented on in-line and then it looks like this change is causing some test failures. Could you please have a look?

Contributor

cachedout commented Nov 25, 2015

@bastiaanb Thanks for this. There is one small lint issue that I commented on in-line and then it looks like this change is causing some test failures. Could you please have a look?

remove trailing whitespace
fix subdict_match test cases
@bastiaanb

This comment has been minimized.

Show comment
Hide comment
@bastiaanb

bastiaanb Nov 25, 2015

Contributor

@cachedout : updated the unit tests. Since the original feature did not include test cases I'm a bit unsure about the intended behaviour of the wildcard matching, so I focus on fixing the regression only.

Contributor

bastiaanb commented Nov 25, 2015

@cachedout : updated the unit tests. Since the original feature did not include test cases I'm a bit unsure about the intended behaviour of the wildcard matching, so I focus on fixing the regression only.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 25, 2015

Contributor

@bastiaanb OK, sounds good. It will take me a little while to carefully review this but we'll try and get this in as soon as possible. Thanks for your hard work here!

Contributor

cachedout commented Nov 25, 2015

@bastiaanb OK, sounds good. It will take me a little while to carefully review this but we'll try and get this in as soon as possible. Thanks for your hard work here!

cachedout added a commit that referenced this pull request Nov 25, 2015

Merge pull request #29192 from bastiaanb/fix/issue-29191-subdict_matc…
…h-regression

fix issue 29191: only try partial matches when a wildcard has been sp…

@cachedout cachedout merged commit 7bd1562 into saltstack:develop Nov 25, 2015

4 of 6 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #215 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11503 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2570 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11211 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10040 — SUCCESS
Details
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 25, 2015

Contributor

Looks good. Merged. Thanks @bastiaanb

Contributor

cachedout commented Nov 25, 2015

Looks good. Merged. Thanks @bastiaanb

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Nov 25, 2015

Contributor

Fixes #29191.

Contributor

jfindlay commented Nov 25, 2015

Fixes #29191.

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Nov 25, 2015

Contributor

This needs to be backported into 2015.8.

Contributor

jfindlay commented Nov 25, 2015

This needs to be backported into 2015.8.

cachedout added a commit that referenced this pull request Nov 30, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment