From f6ac2df6bd7ceddd0f3eb968198cc3ebd1388087 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Tue, 7 Oct 2008 21:59:47 -0600
Subject: [PATCH] Moved tstutil.py into base of tests so it can be used by all
 test subpackages more easily

---
 tests/test_ipalib/test_backend.py       | 2 +-
 tests/test_ipalib/test_cli.py           | 2 +-
 tests/test_ipalib/test_config.py        | 2 +-
 tests/test_ipalib/test_crud.py          | 2 +-
 tests/test_ipalib/test_errors.py        | 2 +-
 tests/test_ipalib/test_frontend.py      | 4 ++--
 tests/test_ipalib/test_ipa_types.py     | 2 +-
 tests/test_ipalib/test_plugable.py      | 6 +++---
 tests/test_ipalib/test_util.py          | 2 +-
 tests/{test_ipalib => }/test_tstutil.py | 0
 tests/{test_ipalib => }/tstutil.py      | 0
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename tests/{test_ipalib => }/test_tstutil.py (100%)
 rename tests/{test_ipalib => }/tstutil.py (100%)

diff --git a/tests/test_ipalib/test_backend.py b/tests/test_ipalib/test_backend.py
index ddf665404..07c5eb009 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 tstutil import ClassChecker
+from tests.tstutil import ClassChecker
 
 
 class test_Backend(ClassChecker):
diff --git a/tests/test_ipalib/test_cli.py b/tests/test_ipalib/test_cli.py
index 4095af6de..c7b37126c 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 tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.tstutil 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 242ce16b8..a1329fa4c 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 tstutil import raises
+from tests.tstutil import raises
 from ipalib import config
 
 
diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py
index fbfbfab1a..e2dd60aab 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 tstutil import read_only, raises, ClassChecker
+from tests.tstutil 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 7c81cf626..bb729776b 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 tstutil import raises, ClassChecker
+from tests.tstutil import raises, ClassChecker
 from ipalib import errors
 
 
diff --git a/tests/test_ipalib/test_frontend.py b/tests/test_ipalib/test_frontend.py
index d99c7bd9d..320e20789 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 tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
-from tstutil import check_TypeError
+from tests.tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.tstutil 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 81261a357..0b8b728e0 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 tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tests.tstutil 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 759ec3c41..bfd7259f6 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 tstutil import raises, no_set, no_del, read_only
-from tstutil import getitem, setitem, delitem
-from tstutil import ClassChecker
+from tests.tstutil import raises, no_set, no_del, read_only
+from tests.tstutil import getitem, setitem, delitem
+from tests.tstutil import ClassChecker
 from ipalib import plugable, errors
 
 
diff --git a/tests/test_ipalib/test_util.py b/tests/test_ipalib/test_util.py
index 0423ad621..5b8b13f79 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 tstutil import raises
+from tests.tstutil import raises
 from ipalib import util
 
 
diff --git a/tests/test_ipalib/test_tstutil.py b/tests/test_tstutil.py
similarity index 100%
rename from tests/test_ipalib/test_tstutil.py
rename to tests/test_tstutil.py
diff --git a/tests/test_ipalib/tstutil.py b/tests/tstutil.py
similarity index 100%
rename from tests/test_ipalib/tstutil.py
rename to tests/tstutil.py