[Checkins] SVN: grok/branches/gotcha-configuration-actions/src/grok/tests/ Fixed tests: use the new location of the grok() helper for tests

Philipp von Weitershausen philikon at philikon.de
Sat Oct 27 11:46:08 EDT 2007


Log message for revision 81131:
  Fixed tests: use the new location of the grok() helper for tests
  (now in grok.testing).
  

Changed:
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapter.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapterdecorator.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/alphabetical.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontextimported.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsmany.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnone.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnonemulti.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interface.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interfacemodule.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontextimported.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadapter.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadaptsnone.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiple.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/namedadapter.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/nomodel.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/oldstyleclass.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/order.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/annotation.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsmany.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsnone.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/name.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/provides.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/application/application.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/base.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basecontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basedirective.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/catalog/indexes_no_app.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/container/container.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/container/container_model.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/error/error.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/event/subscriber.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/customautoform.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/customform.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/fields.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/form.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemaform.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemainherit.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/continue_scanning.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/grokcomponent.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/onlyonce.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/priority.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/json/nocontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/json/view_lookup.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_name.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc3.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_role_name.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_json.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_xmlrpc.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/security/view_decorator.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/static/statichaspy.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/static/staticispackage.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsmany.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone2.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_class.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_directive.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/publicnoncontainer.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/utility/utility.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/ambiguouscontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirandinlinetemplate.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplate.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplateandrender.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplatesonly.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/eithertemplateorrender.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/explicitimplicittemplate.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline_unassociated.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/missingcontext.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/notemplateorrender.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/template.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatedirectory.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatefile.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatenotfound.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatereload.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/twoviewsusetemplate.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/unassociated.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/update.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/update_redirect.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/view/view.py
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/xmlrpc/nocontext.py

-=-
Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapter.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapter.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapter.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapterdecorator.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapterdecorator.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/adapterdecorator.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>>
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/alphabetical.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/alphabetical.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/alphabetical.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Grok does not depend on the alphabetical order:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = ZCave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Explicit class-level context in case of multiple models:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontextimported.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontextimported.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/classcontextimported.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Explicit class-level context for an imported model:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> painting = IPainting(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsmany.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsmany.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsmany.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Subclasses of grok.Adapter and grok.MultiAdapter must implement exactly one
 interface:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.adapter.implementsmany.Home'> is implementing

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnone.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnone.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnone.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Subclasses of grok.Adapter and grok.MultiAdapter must implement exactly one
 interface:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.adapter.implementsnone.Home'> must

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnonemulti.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnonemulti.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/implementsnonemulti.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Subclasses of grok.Adapter and grok.MultiAdapter must implement exactly one
 interface:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.adapter.implementsnonemulti.Home'> must

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Imported model and adapter won't be grokked:
 
   >>> import grok
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from grok.tests.adapter.adapter import IHome
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/importedmodel2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Grok error because import model doesn't count as context:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No module-level context for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interface.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interface.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interface.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 You can also specify interfaces instead of classes with
 `grok.context` (class-level):
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interfacemodule.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interfacemodule.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/interfacemodule.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 You can also specify interfaces instead of classes with
 `grok.context` (module-level):
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Explicit module-level context in case of multiple models:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontextimported.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontextimported.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/modulecontextimported.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Explicit module-level context for an imported model:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> painting = IPainting(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadapter.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadapter.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadapter.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 multiple arguments to grok.adapts, and supplying a matching
 __init__():
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> fireplace = Fireplace()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadaptsnone.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadaptsnone.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiadaptsnone.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Subclasses of grok.MultiAdapter must declare what they adapt, using grok.adapts:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.adapter.multiadaptsnone.Home'> must specify

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiple.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiple.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/multiple.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Multiple models lead to ambiguity:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Multiple possible contexts for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/namedadapter.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/namedadapter.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/namedadapter.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 You can register a named adapter by using grok.name:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/nomodel.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/nomodel.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/nomodel.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 If no model can be found in the module, we get an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No module-level context for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/oldstyleclass.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/oldstyleclass.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/oldstyleclass.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Old-style classes are also supported:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/order.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/order.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/adapter/order.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 If the model is defined after the adapter, it should still be grokked
 properly:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> home = IHome(cave)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/annotation.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/annotation.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/annotation.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from zope import component
   >>> from zope.annotation.attribute import AttributeAnnotations
   >>> component.provideAdapter(AttributeAnnotations)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsmany.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsmany.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsmany.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 it should cspecify which of the many implemented interfaces it should
 be registered for.  Ambiguities lead to errors:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   GrokError: <class
   'grok.tests.annotation.implementsmany.MammothAnnotations'> is

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsnone.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsnone.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/implementsnone.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 interface to indicate which annotation interface they provide and can
 be looked up with:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   GrokError: <class 'grok.tests.annotation.implementsnone.Branding'>
   must implement at least one interface (use grok.implements to

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/name.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/name.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/name.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from zope import component
   >>> from zope.annotation.attribute import AttributeAnnotations
   >>> component.provideAdapter(AttributeAnnotations)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/provides.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/provides.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/annotation/provides.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from zope import component
   >>> from zope.annotation.attribute import AttributeAnnotations
   >>> component.provideAdapter(AttributeAnnotations)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/application/application.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/application/application.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/application/application.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 After grokking a module that defines an application, the application factory is
 available as a utility::
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
     >>> import zope.component
     >>> import grok.interfaces
     >>> calendar_app = zope.component.getUtility(grok.interfaces.IApplication,

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/base.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/base.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/base.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -5,7 +5,7 @@
 classname with 'Base'. Another way is to use the 'grok.baseclass' directive
 on the class itself.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basecontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basecontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basecontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 function as a module-level context, and thus can have views associated
 with it.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basedirective.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basedirective.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/baseclass/basedirective.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 subclasses shouldn't inherit this otherwise there is no way to turn them
 into non-base classes.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/catalog/indexes_no_app.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/catalog/indexes_no_app.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/catalog/indexes_no_app.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 special indexes declaration.  We do need to specify a site (such as
 the application) for the Indexes however, otherwise we get a GrokError:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No site specified for grok.Indexes subclass in module

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/container/container.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/container/container.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/container/container.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -4,7 +4,7 @@
 dictionary API. It in fact stores its information in a BTree so
 you can store a lot of items in a scalable way.
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
 
     >>> from zope.app.container.interfaces import IContainer
     >>> bag = BoneBag()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/container/container_model.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/container/container_model.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/container/container_model.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 registered as the default context object:
 
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
     >>> bag = BoneBag()
     >>> from zope import component
     >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/error/error.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/error/error.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/error/error.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 We expect this grok to fail, and give 
 
   >>> try:
-  ...     grok.tests.grok(__name__)
+  ...     grok.testing.grok(__name__)
   ... except grok.GrokError, error:
   ...     pass
   >>> error.component

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/event/subscriber.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/event/subscriber.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/event/subscriber.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 You can subscribe to events using the @grok.subscribe decorator:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> manfred = Mammoth('Manfred')
   >>> grok.notify(grok.ObjectCreatedEvent(manfred))
   >>> mammoths

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/customautoform.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/customautoform.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/customautoform.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A form view can have a custom form_fields but reusing those fields that
 were deduced automatically, using grok.AutoFields:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 We only expect a single field to be present in the form, as we omitted 'size':
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/customform.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/customform.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/customform.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A form view can completely override which fields are displayed by setting
 form_fields manually:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 We only expect a single field to be present in the form, as we omitted 'size':
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/fields.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/fields.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/fields.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A grok.Fields can receive keyword parameters with schema fields. These
 should be avaible in the definition order.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> from zope import component
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/form.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/form.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/form.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 
   >>> from zope import component
   >>> from zope.publisher.browser import TestRequest
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> manfred = Mammoth()
 
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Forms cannot define a render method. Here we show the case where the
 EditForm has an explicit template associate with it.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   GrokError: It is not allowed to specify a custom 'render' method for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/norender2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Forms cannot define a render method. Here we show the case where the
 EditForm has no explicit template associated with it:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   GrokError: It is not allowed to specify a custom 'render' method for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemaform.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemaform.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemaform.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 A grok.Model may implement one or more interfaces that are schemas:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> manfred = Mammoth()
   >>> print manfred.name
   None

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemainherit.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemainherit.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/form/schemainherit.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 A grok.Model may implement a schema that inherits from another one:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> manfred = Mammoth()
 
   >>> from zope import component

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/continue_scanning.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/continue_scanning.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/continue_scanning.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -5,12 +5,12 @@
 Here we define AlphaGrokker which has higher priority than BetaGrokker but does
 not block BetaGrokker from picking up the same component::
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
 
 In the fixture there is AlphaBetaSub that inherits from both Alpha and Beta.
 Thus, both Grokkers are executed, with AlphaGrokker coming before BetaGrokker::
 
-    >>> grok.tests.grok('grok.tests.grokker.continue_scanning_fixture')
+    >>> grok.testing.grok('grok.tests.grokker.continue_scanning_fixture')
     alpha
     beta
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/grokcomponent.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/grokcomponent.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/grokcomponent.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 Let's first grok the meta module to define some basic grokkers::
 
   >>> import grok
-  >>> grok.tests.grok('grok.meta')
+  >>> grok.testing.grok('grok.meta')
   
 It is possible to grok an individual component. Let's define an adapter::
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/onlyonce.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/onlyonce.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/onlyonce.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -9,7 +9,7 @@
 We do it manually now::
 
   >>> import grok
-  >>> grok.tests.grok('grok.tests.grokker.onlyonce_fixture._meta')
+  >>> grok.testing.grok('grok.tests.grokker.onlyonce_fixture._meta')
 
 This _meta.py module then will be grokked again during 'normal' grok time. Grok
 will not re-register the grokkers as this could have unwanted side-effects. It
@@ -21,7 +21,7 @@
 
 To simulate this, we grok the whole package::
 
-  >>> grok.tests.grok('grok.tests.grokker.onlyonce_fixture')
+  >>> grok.testing.grok('grok.tests.grokker.onlyonce_fixture')
   alpha
 
 """

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/priority.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/priority.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/grokker/priority.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -6,12 +6,12 @@
 - BetaGrokker with priority 1
 - GammaGrokker with priority -1
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
 
 We grok a module that implements subclasses for Alpha, Beta, and Gamma and our
 grokkers get executed in the order of priority (highest first)::
 
-    >>> grok.tests.grok('grok.tests.grokker.priority_fixture')
+    >>> grok.testing.grok('grok.tests.grokker.priority_fixture')
     beta
     alpha
     gamma

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/json/nocontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/json/nocontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/json/nocontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 Context-determination follows the same rules as for adapters. We just check
 whether it's hooked up at all:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No module-level context for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/json/view_lookup.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/json/view_lookup.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/json/view_lookup.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 The JSON grokker registers a view for each method of the JSON class.
 So we should be able to search for view by method name.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> mammoth = Mammoth()
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A permission has to be defined first (using grok.Permission for example)
 before it can be used in grok.require().
 
-    >>> grok.tests.grok(__name__)
+    >>> grok.testing.grok(__name__)
     Traceback (most recent call last):
     ...
     ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission.MissingPermission'>. Use grok.Permission first.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A permission has to be defined first (using grok.Permission for example)
 before it can be used in grok.require() in an JSON class.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json.MissingPermission'>. Use grok.Permission first.
   ...

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_json2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A permission has to be defined first (using grok.Permission for example)
 before it can be used in @grok.require().
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_json2.MissingPermission'>. Use grok.Permission first.
   ...

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_name.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_name.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_name.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 A role has to have a name to be defined.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   GrokError: A permission needs to have a dotted name for its id.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A permission has to be defined first (using grok.Permission for example)
 before it can be used in grok.require() in an XMLRPC class.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc.MissingPermission'>. Use grok.Permission first.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A permission has to be defined first (using grok.Permission for example)
 before it can be used in @grok.require().
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'doesnt.exist' in <class 'grok.tests.security.missing_permission_xmlrpc2.MissingPermission'>. Use grok.Permission first.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc3.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc3.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_permission_xmlrpc3.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 before it can be used in grok.require() in an XMLRPC class. This is even the
 case for a default permission that is never used.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
    ...
   ConfigurationExecutionError: martian.error.GrokError: Undefined permission 'foo' in <class 'grok.tests.security.missing_permission_xmlrpc3.MissingPermission'>. Use grok.Permission first.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_role_name.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_role_name.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/missing_role_name.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 A role has to have a name to be defined.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   GrokError: A role needs to have a dotted name for its id.
   Use grok.name to specify one.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Multiple calls of grok.require in one class are not allowed.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require.MultipleView'>. It may only be set once for a class.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_json.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_json.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_json.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Multiple calls of grok.require in one class are not allowed.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_json.MultipleJSON'>. It may only be set once for a class.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_xmlrpc.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_xmlrpc.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/multiple_require_xmlrpc.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Multiple calls of grok.require in one class are not allowed.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
      ...
   GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_xmlrpc.MultipleXMLRPC'>. It may only be set once for a class.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/security/view_decorator.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/security/view_decorator.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/security/view_decorator.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Using the @grok.require decorator in a view class is not allowed.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   GrokError: The @grok.require decorator is used for method 'render' in view <class 'grok.tests.security.view_decorator.BogusView'>. It may only be used for XML-RPC methods.
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A site can be created by mixing in grok.Site into a grok.Model or
 grok.Container.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> from zope import interface
   >>> from zope.app.component.interfaces import IPossibleSite, ISite

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/static/statichaspy.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/static/statichaspy.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/static/statichaspy.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 a module called 'static.py':
 
   >>> import grok
-  >>> grok.tests.grok('grok.tests.static.statichaspy_fixture')
+  >>> grok.testing.grok('grok.tests.static.statichaspy_fixture')
   Traceback (most recent call last):
     ...
   GrokError: A package can not contain both a 'static' resource directory

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/static/staticispackage.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/static/staticispackage.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/static/staticispackage.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 It is an error for the 'static' directory to be a python package:
 
   >>> import grok
-  >>> grok.tests.grok('grok.tests.static.staticispackage_fixture')
+  >>> grok.testing.grok('grok.tests.static.staticispackage_fixture')
   Traceback (most recent call last):
     ...
   GrokError: The 'static' resource directory must not be a python package.

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Subclasses of grok.GlobalUtility that implement more than one interface must
 specify which interface to use for the registration:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.implementsmany.Club'> is implementing

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsmany2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Subclasses of grok.GlobalUtility that implement more than one interface must
 specify which interface to use for the registration:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.implementsmany2.Club'> is implementing

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Subclasses of grok.GlobalUtility must implement exactly one interface:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.implementsnone.Club'> must

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/implementsnone2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Subclasses of grok.GlobalUtility must implement exactly one interface:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.implementsnone2.Club'> must

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsmany.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsmany.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsmany.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -5,7 +5,7 @@
 In this test, the utility implements more than one interface, so it cannot be
 registered as a local utility.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.local_implementsmany.Fireplace'>

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -5,7 +5,7 @@
 In this test, the utility does not implement any interface, so it cannot be
 registered as a local utility.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: <class 'grok.tests.utility.local_implementsnone.Fireplace'>

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone2.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone2.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/local_implementsnone2.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,5 +1,5 @@
 """
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Cannot determine which interface to use for utility registration of

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_class.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_class.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_class.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 When you try to register multiple classes with the same (interface, name)
 combination multiple times using grok.local_utility, we expect an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Conflicting local utility registration

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_directive.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_directive.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/multiple_directive.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 When you call the grok.local_utility directive multiple times specifying
 the same (interface, name) combination, we expect an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Conflicting local utility registration

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/publicnoncontainer.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/publicnoncontainer.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/publicnoncontainer.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 You cannot use local_utility with 'public' set to True if the site class
 isn't a container:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Cannot set public to True with grok.local_utility as the site

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/utility/utility.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/utility/utility.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/utility/utility.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Global utilities can be created by subclassing grok.GlobalUtility:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from zope import component
 
   >>> normal_club = component.getUtility(IClub)

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/ambiguouscontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/ambiguouscontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/ambiguouscontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Templates with ambiguous context cannot be grokked:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Multiple possible contexts for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirandinlinetemplate.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirandinlinetemplate.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirandinlinetemplate.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 If multiple templates can be found, one in the module and one in the
 template directory, there is an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Conflicting templates found for name 'cavepainting' in module

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplate.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplate.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplate.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Templates can also be found in a directory with the same name as the module:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   
   >>> manfred = Mammoth()
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplateandrender.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplateandrender.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplateandrender.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 A View may either have an associated template or a render-method. Here
 we check that this also works for templates in a template-directory:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Multiple possible ways to render view

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplatesonly.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplatesonly.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/dirtemplatesonly.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -6,7 +6,7 @@
   >>> warnings.warn = warn
 
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
     From tests.py's showwarning():
     ... UserWarning: File 'invalid.txt' has an unrecognized extension in directory '...dirtemplatesonly_templates'...
     

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/eithertemplateorrender.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/eithertemplateorrender.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/eithertemplateorrender.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Only one, either a template, or render() can be specified:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Multiple possible ways to render view

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/explicitimplicittemplate.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/explicitimplicittemplate.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/explicitimplicittemplate.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 associated with a view while that view already refers to another
 template using grok.template.  Therefore there is an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: Multiple possible templates for view

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Templates can be specified in the same module as the view,
 using a variable named `viewname_pt`:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   
   >>> manfred = Mammoth()
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline_unassociated.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline_unassociated.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/inline_unassociated.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Inline templates that are not associated with a view class will
 provoke an error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   GrokError: Found the following unassociated template(s) when grokking

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/missingcontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/missingcontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/missingcontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Views without a context cannot be grokked:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No module-level context for

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/notemplateorrender.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/notemplateorrender.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/notemplateorrender.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 Views either need an associated template or a ``render`` method:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: View <class 'grok.tests.view.notemplateorrender.CavePainting'>

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/template.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/template.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/template.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,6 +1,6 @@
 """
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 View with an associated PageTemplate that is referred to using
 ``grok.template``:

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatedirectory.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatedirectory.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatedirectory.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 You can explicitly specify the template directory using grok.templatedir on module level:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> manfred = Mammoth()
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatefile.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatefile.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatefile.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,6 +1,6 @@
 """
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 View with an associated PageTemplate that is referred to using
 ``grok.template``:

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatenotfound.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatenotfound.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatenotfound.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 This should fail because ``grok.template`` points to a non-existing
 template:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: View <class 'grok.tests.view.templatenotfound.Painting'>

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatereload.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatereload.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/templatereload.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Filesystem-based templates, once grokked, can be changed.  The change
 will automatically be picked up, reloading Zope is not necessary.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   >>> from zope.component import getMultiAdapter
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/twoviewsusetemplate.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/twoviewsusetemplate.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/twoviewsusetemplate.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,7 +1,7 @@
 """
 A template can be used by multiple views at the same time:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> manfred = Mammoth()
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/unassociated.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/unassociated.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/unassociated.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 Templates that are not associated with a view class will provoke an
 error:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
   ...
   GrokError: Found the following unassociated template(s) when grokking

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/update.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/update.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/update.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 used e. g. to execute side effects or set up data for use in the
 template.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 We need to set up a default ITraversable adapter so that TALES
 expressions can resolve paths:

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/update_redirect.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/update_redirect.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/update_redirect.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -2,7 +2,7 @@
 When a view's update() method redirects somewhere else, the template
 is not executed subsequently.
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> manfred = Mammoth()
   >>> from zope.publisher.browser import TestRequest

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/view/view.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/view/view.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/view/view.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -1,6 +1,6 @@
 """
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
 
 We should find the ``cavepainting`` view for a mammoth:
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/xmlrpc/nocontext.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/xmlrpc/nocontext.py	2007-10-27 15:45:43 UTC (rev 81130)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/xmlrpc/nocontext.py	2007-10-27 15:46:08 UTC (rev 81131)
@@ -3,7 +3,7 @@
 Context-determination follows the same rules as for adapters. We just check
 whether it's hooked up at all:
 
-  >>> grok.tests.grok(__name__)
+  >>> grok.testing.grok(__name__)
   Traceback (most recent call last):
     ...
   GrokError: No module-level context for



More information about the Checkins mailing list