URL: https://github.com/freeipa/freeipa/pull/305
Author: tiran
 Title: #305: Fetch correct exception in IPA_CONFDIR test
Action: opened

PR body:
fixes c2934aaa

Signed-off-by: Christian Heimes <chei...@redhat.com>

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/305/head:pr305
git checkout pr305
From 97908927b62718949059fd7778e38f76b90d94db Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Mon, 5 Dec 2016 10:42:33 +0100
Subject: [PATCH] Fetch correct exception in IPA_CONFDIR test

fixes c2934aaa

Signed-off-by: Christian Heimes <chei...@redhat.com>
 ipatests/test_ipalib/test_plugable.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ipatests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py
index ff22446..6954610 100644
--- a/ipatests/test_ipalib/test_plugable.py
+++ b/ipatests/test_ipalib/test_plugable.py
@@ -28,7 +28,6 @@
 import textwrap
 from ipalib import plugable, errors, create_api
-from ipapython.admintool import ScriptError
 from ipatests.util import raises, read_only
 from ipatests.util import ClassChecker, create_test_api, TempHome
@@ -301,7 +300,7 @@ def test_ipaconf_env(self):
                 os.environ['IPA_CONFDIR'] = home.join('invalid')
                 api = create_api(mode='unit_test')
-                with pytest.raises(ScriptError):
+                with pytest.raises(errors.EnvironmentError):
             if ipa_confdir:
Manage your subscription for the Freeipa-devel mailing list:
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to