Integration tests fixes for 2016.3 #36263
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
Skip git state integration tests if 'git' does not exists Prevent OSError if 'git' command not found during _git_version()
|
Thanks again for cleaning these up @meaksh! Also, just so you know, we always merge changes forward (2015.8 into 2016.3, 2016.3 into "carbon", and then "carbon" into develop), so there isn't a need to submit multiple pull requests for each branch that have the same changes. (I know this one is slightly different than #36262, but it is very similar.) Hopefully that just reduces some work for you and any worries you might have about what should go into which branch. :) Changes that go into 2015.8 should reach develop within a couple of days. Thank you again for cleaning these test cases up. It is very much appreciated! |
|
Ok, perfect! Thank you @rallytime for your help and clarification. 👍 |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Sep 15, 2016
* upstream/develop: (92 commits) Switch the order of the decorator Back-port saltstack#36273 to 2016.3 (saltstack#36295) Back-port saltstack#36124 to 2016.3 (saltstack#36296) Fix pkg group test by passing a list instead of str Report the reason that a module did not load to the user via remote-ex (saltstack#36259) Gate the pkg.group_installed state test: not all pkg modules have group_install Filter out pub kwargs from cloud runner (saltstack#36178) Add append_newline flag for saltstack#33686 (saltstack#36273) Don't stop to failover if all masters not reachable. Schema test requires jsonschema 2.5.0 or above Fix pkg group test by passing a list instead of str Improved gitfs/git_pillar error logging Integration tests fixes for 2015.8 (saltstack#36262) Protect the dbus import for a loader stacktrace in avahi_announce beacon Fix for new integration test for fileserver.clear_file_list_cache salt.utils.gitfs: Check for existence of ssh keys Pylint fix Integration tests fixes for 2016.3 (saltstack#36263) Fix misspelling of "occurred" in log messages/exceptions (saltstack#36270) Pass the key kwarg through to the flush function ...
|
@meaksh Definitely! And thank you for contributing! |
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?
This PR fixes some integration tests failures in
2016.3:This changes should also be included in
develop.Thanks!