Arch linux does not have osrelease or osmajorrelease grains #34453
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if os == 'Arch' and grain in ['osmajorrelease', 'osrelease']: | ||
| self.assertEqual(get_grain, '') | ||
| continue | ||
| self.assertTrue(get_grain) |
There was a problem hiding this comment.
Any reason why you removed the helper message from the assert above? (grain + " is not available")
There was a problem hiding this comment.
Because when the grain doesn't exist it doesn't return that message. it just returns empty.
salt-call --local grains.item osmajorrelease
local:
----------
osmajorrelease:salt --versions-report
Salt Version:
Salt: 2016.3.1
Dependency Versions:
cffi: 1.7.0
cherrypy: 3.8.0
dateutil: 2.4.2
gitdb: 0.6.4
gitpython: 1.0.1
ioflo: 1.5.0
Jinja2: 2.8
libgit2: Not Installed
libnacl: 1.4.4
M2Crypto: 0.24.0
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 0.4.7
mysql-python: 1.2.5
pycparser: 2.14
pycrypto: 2.6.1
pygit2: Not Installed
Python: 2.7.11 (default, Mar 31 2016, 06:18:34)
python-gnupg: 0.3.7
PyYAML: 3.11
PyZMQ: 15.2.0
RAET: 0.6.5
smmap: 0.9.0
timelib: 0.2.4
Tornado: 4.3
ZMQ: 4.1.4
System Versions:
dist:
machine: x86_64
release: 4.1.3
system: Linux
version: Not InstalledThere was a problem hiding this comment.
example non-existent grain
salt-call --local grains.item fakegrainitem
local:
----------
fakegrainitem:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Arch linux does not have release versions, so it does not have the osrelease/osmajorrelease grains for it. This change accounts for the release grains not existing.
What issues does this PR fix or reference?
Fixes failing tests on Arch.
Tests written?
Yes