diff options
-rw-r--r-- | tests/test_ipalib/test_backend.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_cli.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_config.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_crud.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_errors.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_frontend.py | 4 | ||||
-rw-r--r-- | tests/test_ipalib/test_ipa_types.py | 2 | ||||
-rw-r--r-- | tests/test_ipalib/test_plugable.py | 6 | ||||
-rw-r--r-- | tests/test_ipalib/test_util.py | 2 | ||||
-rw-r--r-- | tests/test_util.py (renamed from tests/test_tstutil.py) | 36 | ||||
-rw-r--r-- | tests/util.py (renamed from tests/tstutil.py) | 0 |
11 files changed, 30 insertions, 30 deletions
diff --git a/tests/test_ipalib/test_backend.py b/tests/test_ipalib/test_backend.py index 07c5eb009..cd490fe04 100644 --- a/tests/test_ipalib/test_backend.py +++ b/tests/test_ipalib/test_backend.py @@ -22,7 +22,7 @@ Test the `ipalib.backend` module. """ from ipalib import backend, plugable, errors -from tests.tstutil import ClassChecker +from tests.util import ClassChecker class test_Backend(ClassChecker): diff --git a/tests/test_ipalib/test_cli.py b/tests/test_ipalib/test_cli.py index c7b37126c..33e4d2207 100644 --- a/tests/test_ipalib/test_cli.py +++ b/tests/test_ipalib/test_cli.py @@ -21,7 +21,7 @@ Test the `ipalib.cli` module. """ -from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker +from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker from ipalib import cli, plugable diff --git a/tests/test_ipalib/test_config.py b/tests/test_ipalib/test_config.py index a1329fa4c..7b12a53e4 100644 --- a/tests/test_ipalib/test_config.py +++ b/tests/test_ipalib/test_config.py @@ -23,7 +23,7 @@ Test the `ipalib.config` module. import types -from tests.tstutil import raises +from tests.util import raises from ipalib import config diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py index e2dd60aab..3113ec697 100644 --- a/tests/test_ipalib/test_crud.py +++ b/tests/test_ipalib/test_crud.py @@ -21,7 +21,7 @@ Test the `ipalib.crud` module. """ -from tests.tstutil import read_only, raises, ClassChecker +from tests.util import read_only, raises, ClassChecker from ipalib import crud, frontend, plugable, config def get_api(): diff --git a/tests/test_ipalib/test_errors.py b/tests/test_ipalib/test_errors.py index bb729776b..8db810da8 100644 --- a/tests/test_ipalib/test_errors.py +++ b/tests/test_ipalib/test_errors.py @@ -21,7 +21,7 @@ Test the `ipalib.errors` module. """ -from tests.tstutil import raises, ClassChecker +from tests.util import raises, ClassChecker from ipalib import errors diff --git a/tests/test_ipalib/test_frontend.py b/tests/test_ipalib/test_frontend.py index 320e20789..4b1b56cfb 100644 --- a/tests/test_ipalib/test_frontend.py +++ b/tests/test_ipalib/test_frontend.py @@ -21,8 +21,8 @@ Test the `ipalib.frontend` module. """ -from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker -from tests.tstutil import check_TypeError +from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker +from tests.util import check_TypeError from ipalib import frontend, backend, plugable, errors, ipa_types, config diff --git a/tests/test_ipalib/test_ipa_types.py b/tests/test_ipalib/test_ipa_types.py index 0b8b728e0..65d1f63d0 100644 --- a/tests/test_ipalib/test_ipa_types.py +++ b/tests/test_ipalib/test_ipa_types.py @@ -21,7 +21,7 @@ Test the `ipalib.ipa_types` module. """ -from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker +from tests.util import raises, getitem, no_set, no_del, read_only, ClassChecker from ipalib import ipa_types, errors, plugable diff --git a/tests/test_ipalib/test_plugable.py b/tests/test_ipalib/test_plugable.py index bfd7259f6..783a450a3 100644 --- a/tests/test_ipalib/test_plugable.py +++ b/tests/test_ipalib/test_plugable.py @@ -21,9 +21,9 @@ Test the `ipalib.plugable` module. """ -from tests.tstutil import raises, no_set, no_del, read_only -from tests.tstutil import getitem, setitem, delitem -from tests.tstutil import ClassChecker +from tests.util import raises, no_set, no_del, read_only +from tests.util import getitem, setitem, delitem +from tests.util import ClassChecker from ipalib import plugable, errors diff --git a/tests/test_ipalib/test_util.py b/tests/test_ipalib/test_util.py index 5b8b13f79..04ff23f09 100644 --- a/tests/test_ipalib/test_util.py +++ b/tests/test_ipalib/test_util.py @@ -21,7 +21,7 @@ Test the `ipalib.util` module. """ -from tests.tstutil import raises +from tests.util import raises from ipalib import util diff --git a/tests/test_tstutil.py b/tests/test_util.py index c441ddb8e..7d7038c1a 100644 --- a/tests/test_tstutil.py +++ b/tests/test_util.py @@ -18,10 +18,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -Test the `tests.tstutil` module. +Test the `tests.util` module. """ -import tstutil +import util class Prop(object): @@ -48,7 +48,7 @@ class Prop(object): def test_yes_raised(): - f = tstutil.raises + f = util.raises class SomeError(Exception): pass @@ -79,54 +79,54 @@ def test_yes_raised(): raised = False try: f(SomeError, callback3) - except tstutil.ExceptionNotRaised: + except util.ExceptionNotRaised: raised = True assert raised def test_no_set(): # Tests that it works when prop cannot be set: - tstutil.no_set(Prop('get', 'del'), 'prop') + util.no_set(Prop('get', 'del'), 'prop') # Tests that ExceptionNotRaised is raised when prop *can* be set: raised = False try: - tstutil.no_set(Prop('set'), 'prop') - except tstutil.ExceptionNotRaised: + util.no_set(Prop('set'), 'prop') + except util.ExceptionNotRaised: raised = True assert raised def test_no_del(): # Tests that it works when prop cannot be deleted: - tstutil.no_del(Prop('get', 'set'), 'prop') + util.no_del(Prop('get', 'set'), 'prop') # Tests that ExceptionNotRaised is raised when prop *can* be set: raised = False try: - tstutil.no_del(Prop('del'), 'prop') - except tstutil.ExceptionNotRaised: + util.no_del(Prop('del'), 'prop') + except util.ExceptionNotRaised: raised = True assert raised def test_read_only(): # Test that it works when prop is read only: - assert tstutil.read_only(Prop('get'), 'prop') == 'prop value' + assert util.read_only(Prop('get'), 'prop') == 'prop value' # Test that ExceptionNotRaised is raised when prop can be set: raised = False try: - tstutil.read_only(Prop('get', 'set'), 'prop') - except tstutil.ExceptionNotRaised: + util.read_only(Prop('get', 'set'), 'prop') + except util.ExceptionNotRaised: raised = True assert raised # Test that ExceptionNotRaised is raised when prop can be deleted: raised = False try: - tstutil.read_only(Prop('get', 'del'), 'prop') - except tstutil.ExceptionNotRaised: + util.read_only(Prop('get', 'del'), 'prop') + except util.ExceptionNotRaised: raised = True assert raised @@ -134,15 +134,15 @@ def test_read_only(): # deleted: raised = False try: - tstutil.read_only(Prop('get', 'del'), 'prop') - except tstutil.ExceptionNotRaised: + util.read_only(Prop('get', 'del'), 'prop') + except util.ExceptionNotRaised: raised = True assert raised # Test that AttributeError is raised when prop can't be read: raised = False try: - tstutil.read_only(Prop(), 'prop') + util.read_only(Prop(), 'prop') except AttributeError: raised = True assert raised diff --git a/tests/tstutil.py b/tests/util.py index 5656515ca..5656515ca 100644 --- a/tests/tstutil.py +++ b/tests/util.py |