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

Fix some git_pillar integration test failures

Browse source 
For some reason these were not failing when I opened #40777, but now
that the PR is merged are failing for PR builds (as well as locally in
my test env). This fixes those failures.
This commit is contained in:
Erik Johnson 2017-05-01 17:13:42 -05:00
parent 5e4babba89
commit 39157b40ed
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/support/gitfs.py
View file

@ -448,6 +448,7 @@ class GitPillarSSHTestBase(GitPillarTestBase, SSHDMixin):
Base class for GitPython and Pygit2 SSH tests
'''
id_rsa_nopass = id_rsa_withpass = None
git_ssh = '/tmp/git_ssh'
@classmethod
def tearDownClass(cls):
@ -463,7 +464,7 @@ class GitPillarSSHTestBase(GitPillarTestBase, SSHDMixin):
cls.id_rsa_nopass + '.pub',
cls.id_rsa_withpass,
cls.id_rsa_withpass + '.pub',
cls.case.git_ssh):
cls.git_ssh):
try:
os.remove(os.path.join(ssh_dir, filename))
except OSError as exc:
@ -478,7 +479,6 @@ class GitPillarSSHTestBase(GitPillarTestBase, SSHDMixin):
self.sshd_proc = self.find_proc(name='sshd',
search=self.sshd_config)
self.sshd_bin = salt.utils.which('sshd')
self.git_ssh = '/tmp/git_ssh'
if self.sshd_proc is None:
self.spawn_server()