Changeset 12595 for main/waeup.kofa/trunk/src/waeup

Timestamp:

11 Feb 2015, 15:28:49 (10 years ago)

Author:

uli

Message:

Move test helper.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/tests/test_async.py (modified) (3 diffs)
• testing.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_async.py

@@ -3 +3 @@
 import tempfile
 import transaction
-from contextlib import contextmanager
 from zc.async.testing import wait_for_result
 from zope.component import getUtility
@@ -12 +11 @@
 from waeup.kofa.async import AsyncJob, get_job_id
 from waeup.kofa.interfaces import IJobManager, IKofaUtils
-from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer
+from waeup.kofa.testing import (
+    FunctionalTestCase, FunctionalLayer, expensive_actions,
+    )
 from waeup.kofa.tests.test_async import FunctionalAsyncTestCase
 
@@ -22 +23 @@
 def dummy_func():
     return 42
-
-
-@contextmanager
-def expensive_actions():
-    """A contextmanager to work with a modified `expensive_acrtions_allowed()`
-
-    This method is part of local IKofaUtils.
-    """
-    utils = getUtility(IKofaUtils)
-    old_func = utils.expensive_actions_allowed
-    try:
-        yield utils
-    finally:
-        # restore function after use
-        utils.expensive_actions_allowed = old_func
 
 

main/waeup.kofa/trunk/src/waeup/kofa/testing.py

@@ -29 +29 @@
 import zope.component
 import waeup.kofa
+from contextlib import contextmanager
 from zc.async.interfaces import COMPLETED
 from zope.app.testing.functional import (
     ZCMLLayer, FunctionalTestSetup, getRootFolder, sync, FunctionalTestCase)
-from zope.component import getGlobalSiteManager, queryUtility
+from zope.component import getGlobalSiteManager, queryUtility, getUtility
 from zope.security.testing import addCheckerPublic
 from zope.testing import renormalizing
 from zope.testing.cleanup import cleanUp
+from waeup.kofa.interfaces import IKofaUtils
 
 ftesting_zcml = os.path.join(
@@ -472 +474 @@
             del self._jobs[job_id]
         return
+
+
+@contextmanager
+def expensive_actions():
+    """A contextmanager to work with a modified `expensive_acrtions_allowed()`
+
+    This method is part of local IKofaUtils.
+    """
+    utils = getUtility(IKofaUtils)
+    old_func = utils.expensive_actions_allowed
+    try:
+        yield utils
+    finally:
+        # restore function after use
+        utils.expensive_actions_allowed = old_func