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

Integration tests fixes for 2015.8 #36262

Merged
merged 2 commits into from
Sep 13, 2016

Conversation

meaksh
Copy link
Contributor

@meaksh meaksh commented Sep 13, 2016

What does this PR do?

This PR fixes some integration tests failures in 2015.8 if git or azure are not present:

  1. Fix integration tests if azure is not present
  2. Skip git state integration tests if 'git' does not exists
  3. Prevent OSError if 'git' command not found during _git_version()

Thanks!

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
@rallytime
Copy link
Contributor

Go Go Jenkins!

@rallytime rallytime merged commit ed2d2bd into saltstack:2015.8 Sep 13, 2016
@meaksh meaksh deleted the integration-tests-fixes-2015.8 branch September 15, 2016 07:53
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
  ...
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