[2016.3] Merge forward from 2015.8 to 2016.3 #36158
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
Don't prevent the Scheduled Task option from doing package operations, when the system is running on batteries
If the Scheduled Task fails to launch, log this and report the failed status. Don't check for success as the Task Scheduler doesn't give return codes for actions it ran, and only the minion upgrade should be using this (so successful installation or removal would never be reported anyway).
* Comment all lines in the minion config file * Add unit tests to check for all files in conf/ to be commented out * Make sure cont/cloud.profiles file is commented out Matches the cloud.providers file format and other sample config files. * Add unit tests for sample files in cloud.profiles.d, cloud.providers.d, and cloud.maps.d * Make sure all sample config files in cloud.maps.d are commented out * Make sure all sample config files in cloud.profiles.d are commented out
Newer pygit2 releases require that this value be a string, they will not accept a bool here.
pygit2: Prevent traceback on initial gitfs setup
…teries win_pkg: Allow minion upgrade on batteries and report launch failure
date_cast() throws a RuntimeError, not an ImportError
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info * Fix unit/pyobjects_test.py::MapTests::test_map * Fix tests/unit/pyobjects_test.py::RendererTests::test_extend * Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
Trying to assert that an exception was raised using helper_open.write.assertRaises() is bogus--there is no such method. Use standard unittest.assertRaises() instead.
…tion 'read_async'.
Lists in py2 don't have the clear method
These tests have never run automatically because of an incorrect file name. Added a skipIf on these tests as they are currently non-functioning and the module they're testing has been deprecated.
The method logic was changed in mock-1.1.0. This mades the use of the method compatible with both <1.1.0 and >=1.1.0
Trying to assert that an exception was raised using helper_open.write.assertRaises() is bogus--there is no such method. Use standard unittest.assertRaises() instead.
Updated message in darwin_sysctl module when return False if OS is not OSX.
Fixing unit tests for 2015.8
Incorrect handling of os.path.splitdrive()
Conflicts: - tests/unit/modules/boto_vpc_test.py - tests/unit/modules/mount_test.py - tests/unit/modules/puppet_test.py
|
Go Go Jenkins! |
1 similar comment
|
Go Go Jenkins! |
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: