Skip to content

Honor path when retrieving K5Test utilities #41

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 22, 2015
Merged

Honor path when retrieving K5Test utilities #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions gssapi/tests/k5test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import signal
import socket
import string
import sys
import subprocess
import tempfile
import unittest
Expand Down Expand Up @@ -150,15 +151,36 @@ def __init__(self, realm='KRBTEST.COM', portbase=61000,
self.kinit(self.user_princ, self.password('user'))
self.klist()

def _discover_path(self, name, default, paths):
stderr_out = getattr(subprocess, 'DEVNULL', subprocess.PIPE)
try:
path = subprocess.check_output(['which', name],
stderr=stderr_out).strip()
path = path.decode(sys.getfilesystemencoding() or
sys.getdefaultencoding())
print("Using discovered path for {name} ({path}".format(
name=name, path=path))
return path
except subprocess.CalledProcessError as e:
path = paths.get(name, default)
print("Using default path for {name} ({path}): {err}".format(
name=name, path=path, err=e))
return path

def _init_paths(self, **paths):
self.kdb5_util = paths.get('kdb5_util', '/usr/sbin/kdb5_util')
self.krb5kdc = paths.get('krb5kdc', '/usr/sbin/krb5kdc')
self.kadmin_local = paths.get('kadmin_local', '/usr/sbin/kadmin.local')
self.kprop = paths.get('kprop', '/usr/sbin/kprop')
self.kadmind = paths.get('kadmind', '/usr/sbin/kadmind')

self._kinit = paths.get('kinit', '/usr/bin/kinit')
self._klist = paths.get('klist', '/usr/bin/klist')
self.kdb5_util = self._discover_path('kdb5_util',
'/usr/sbin/kdb5_util', paths)
self.krb5kdc = self._discover_path('krb5kdc',
'/usr/sbin/krb5kdc', paths)
self.kadmin_local = self._discover_path('kadmin_local',
'/usr/sbin/kadmin.local',
paths)
self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths)
self.kadmind = self._discover_path('kadmind',
'/usr/sbin/kadmind', paths)

self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths)
self._klist = self._discover_path('klist', '/usr/bin/klist', paths)

def _create_conf(self, profile, filename):
with open(filename, 'w') as conf_file:
Expand Down