saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27695 from rallytime/bp-27671

Browse source 
Back-port #27671 to 2015.5
This commit is contained in:
Colton Myers 2015-10-05 15:57:36 -06:00
commit 43fba89865
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/modules/pillar.py
View file

@ -99,7 +99,6 @@ class PillarModuleTest(integration.ModuleCase):
def no_test_issue_10408_ext_pillar_gitfs_url_update(self):
import os
from salt.pillar import git_pillar
import git
original_url = 'git+ssh://original@example.com/home/git/test'
changed_url = 'git+ssh://changed@example.com/home/git/test'
rp_location = os.path.join(self.master_opts['cachedir'], 'pillar_gitfs/0/.git')
@ -115,10 +114,11 @@ class PillarModuleTest(integration.ModuleCase):
self.assertEqual(grepo.rp_location, repo.remotes.origin.url)
@skipIf(HAS_GIT_PYTHON is False,
'GitPython must be installed and >= version {0}'.format(GIT_PYTHON))
def test_ext_pillar_env_mapping(self):
import os
from salt.pillar import git_pillar
import git
repo_url = 'https://github.com/saltstack/pillar1.git'
pillar = self.run_function('pillar.data')