1 files changed, 22 insertions, 1 deletions
diff --git a/tests/util.py b/tests/util.py
index 3033b82b..af4c2393 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -28,6 +28,7 @@ import tempfile
 import shutil
 import ipalib
 from ipalib.plugable import Plugin
+from ipalib.request import context
 
 
 
@@ -202,6 +203,14 @@ class ClassChecker(object):
             'get_subcls()'
         )
 
+    def tearDown(self):
+        """
+        nose tear-down fixture.
+        """
+        for name in ('ugettext', 'ungettext'):
+            if hasattr(context, name):
+                delattr(context, name)
+
 
 
 
@@ -297,12 +306,24 @@ class dummy_ugettext(object):
         assert type(self.translation) is unicode
 
     def __call__(self, message):
-        assert type(message) is str
         assert self.__called is False
         self.__called = True
+        assert type(message) is str
+        assert not hasattr(self, 'message')
         self.message = message
+        assert type(self.translation) is unicode
         return self.translation
 
+    def called(self):
+        return self.__called
+
+    def reset(self):
+        assert type(self.translation) is unicode
+        assert type(self.message) is str
+        del self.message
+        assert self.__called is True
+        self.__called = False
+
 
 class dummy_ungettext(object):
     __called = False