[2016.3] Merge forward from 2015.8 to 2016.3 #33866
Merged
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
When getting all the top files for the various environments, those environments without a top file will return ``False`` when we attempt to cache the file. Passing a boolean to ``compile_template()`` will result in an error being logged, since we are invoking the function incorrectly (it expects the template data to be a string). Since a ``False`` return from caching the file means that it does not exist, this commit will only run ``compile_template()`` when the contents evaluate to ``True``. Resolves saltstack#33424.
Rather than excluding them from the get_tops() return data at all, just populate them with empty dictionaries. This makes it easier to unit test things like merge order, while still being functionally the same as exlcluding the saltenv from get_tops() altogether.
Only compile the template contents if they evaluate to True
Fix win servermanager
On Gentoo, we should check the value passed in to timezone.set_hwclock and only allow 'UTC' or 'localtime' for argument. If incorrect value is passed in, it could subsequently fry the important config file. There is another closely related issue on Gentoo. The value to set 'clock' variable in the config file is either 'UTC' or 'local'. In case of localtime arg, we should convert the value of 'localtime' to 'local' when setting that 'clock' variable.
Erik Johnson pointed out the speed issue with compelling numbers:
>>> import timeit
>>> t1 = timeit.Timer('clock == "localtime"', 'clock = "localtime"')
>>> t2 = timeit.Timer('clock.__eq__("localtime")', 'clock = "localtime"')
>>> t1.repeat()
[0.061421871185302734, 0.0285952091217041, 0.026736021041870117]
>>> t2.repeat()
[0.1310901641845703, 0.09536910057067871, 0.09479284286499023]
I'll absolutely fix it by using the simple '==' operator.
Thank you!
…urce is available
Make `configurable_test_state` configurable even in test mode and return the correct result in test mode as per https://docs.saltstack.com/en/latest/ref/states/writing.html#return-data.
Also adjust continued string indentation.
When the remote repository does not have a master branch, on the initial checkout there will be no ref in refs/remotes/origin for this branch, leading to an error being logged and the checkout failing. Instead of failing the checkout, in these cases we'll create the initial local HEAD based on the ref we will eventually check out, since we know for a fact that this ref exists. Resolves saltstack#33725
Back-port saltstack#33700 to 2015.8
…e-failures-in-SLE11-2015.8 Fix for groupadd execution module failures in SLES11 systems
Catch oserror for race condition
Catch no minions exception in batch mode
The network.get_bufsize function requires an interface for arg. In the example that part is missing. Add arbitrary 'eth0' for clarity.
…604-1939 Fix minor docstring issue of arg being missing
Gem integration test
service state integration tests
fix some problems with the gem module integration tests
states.pkg int tests: skip if pkg mgr unavailable
This time win_servermanager
…er_test Fixing more stupid unit tests
These all assert directly against mock objects. They're pointless.
…_tests Remove matcher tests
…t_stacktrace Fix another unit test stacktrace in pkg_resource
Fix broken locate.locate function
Conflicts: - salt/cli/salt.py - salt/modules/groupadd.py - salt/states/service.py
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.
Conflicts: