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

Back-port #27671 to 2015.5 #27695

Merged
merged 1 commit into from Oct 5, 2015

Conversation

Projects
None yet
3 participants
@rallytime
Contributor

rallytime commented Oct 5, 2015

Back-port #27671 to 2015.5

Added skip test_ext_pillar_env_mapping if git module does not exist.
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.

basepi added a commit that referenced this pull request Oct 5, 2015

@basepi basepi merged commit 43fba89 into saltstack:2015.5 Oct 5, 2015

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #10028 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #1101 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #9746 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #8575 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:bp-27671 branch Oct 5, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment