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 core grains when Debian OS detected as 'Debian GNU/Linux' #31418

Merged
merged 4 commits into from Feb 23, 2016

Conversation

terminalmage
Copy link
Contributor

885e00b broke this on the head of 2015.8, this pull request fixes it and adds a
unit test to ensure this doesn't regress again.

Fixes #31410.

This was broken in 885e00b because the updated regex now removes the
slash in 'Debian GNU/Linux'.

This issue did not make it into an official release, it exists only in
the head of the 2015.8 branch.
@cachedout
Copy link
Contributor

Go Go Jenkins!

@terminalmage
Copy link
Contributor Author

The passing tests here seem to be a false positive... I don't see that my new test was actually run. I did create a new grains directory under tests/unit/ and thought the tests might not run, so I checked the salt-runtests.log and sure enough it's not there.

@terminalmage
Copy link
Contributor Author

So we'll want to hold off on merging until we can figure this out.

@terminalmage
Copy link
Contributor Author

Looks like I'll need to modify runtests.py to get this working.

@terminalmage
Copy link
Contributor Author

OK, my additions to runtests.py have my unit test running and it is passing. Should be good to merge.

cachedout pushed a commit that referenced this pull request Feb 23, 2016
Fix core grains when Debian OS detected as 'Debian GNU/Linux'
@cachedout cachedout merged commit 64ed9fc into saltstack:2015.8 Feb 23, 2016
@terminalmage terminalmage deleted the fix-debian-grains branch April 6, 2016 23:24
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.

None yet

2 participants