Refactor tests so functional tests are now also discovered by tox, tr…

…avis runs
zopefoundation · Jan 11, 2018 · 5bccf1c · 5bccf1c
1 parent e4ae2df
commit 5bccf1c
Show file tree

Hide file tree

Showing 181 changed files with 134 additions and 129 deletions.
diff --git a/src/grokcore/view/ftesting.zcml b/src/grokcore/view/ftesting.zcml
@@ -34,7 +34,7 @@
   <role id="grok.BoneOwner" title="Bone Owner" />
   <grant role="grok.BoneOwner" permission="bone.gold" />
 
-  <grok:grok package="grokcore.view.ftests" />
+  <grok:grok package="grokcore.view.tests.functional" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
@@ -67,9 +67,9 @@
 
   <!-- Register a test fixture -->
   <adapter
-     factory="grokcore.view.ftests.static.simple.DummyResource"
+     factory="grokcore.view.tests.functional.static.simple.DummyResource"
      for="zope.publisher.interfaces.browser.IBrowserRequest"
      provides="zope.interface.Interface"
-     name="grokcore.view.ftests.static.simple_fixture" />
+     name="grokcore.view.tests.functional.static.simple_fixture" />
 
 </configure>
diff --git a/src/grokcore/view/ftests/static/notemplates_nooverridestatic/override/override.py b/src/grokcore/view/ftests/static/notemplates_nooverridestatic/override/override.py
diff --git a/src/grokcore/view/ftests/static/notemplates_overridestatic/override/override.py b/src/grokcore/view/ftests/static/notemplates_overridestatic/override/override.py
diff --git a/src/grokcore/view/ftests/static/overridetemplates_overridestatic/override/override.py b/src/grokcore/view/ftests/static/overridetemplates_overridestatic/override/override.py
diff --git a/src/grokcore/view/ftests/static/templates_nooverridestatic/override/override.py b/src/grokcore/view/ftests/static/templates_nooverridestatic/override/override.py
diff --git a/src/grokcore/view/tests/base/__init__.py b/src/grokcore/view/tests/base/__init__.py
@@ -0,0 +1 @@
+# make this directory a package
diff --git a/...e/view/ftests/contentprovider/__init__.py → ...ew/tests/base/contentprovider/__init__.py b/...e/view/ftests/contentprovider/__init__.py → ...ew/tests/base/contentprovider/__init__.py
diff --git a/...entprovider/contentprovider_references.py → ...entprovider/contentprovider_references.py b/...entprovider/contentprovider_references.py → ...entprovider/contentprovider_references.py
diff --git a/...er/contentprovider_render_and_template.py → ...er/contentprovider_render_and_template.py b/...er/contentprovider_render_and_template.py → ...er/contentprovider_render_and_template.py
@@ -7,7 +7,7 @@
    ...
   zope.configuration.config.ConfigurationExecutionError: \
   martian.error.GrokError: Multiple possible ways\
-  to render contentprovider <class 'grokcore.view.tests.\
+  to render contentprovider <class 'grokcore.view.tests.base.\
 contentprovider.contentprovider_render_and_template.ContentProvider'>.\
   It has both a 'render' method as well as an associated template.\
   in:

diff --git a/...and_template_templates/contentprovider.pt → ...and_template_templates/contentprovider.pt b/...and_template_templates/contentprovider.pt → ...and_template_templates/contentprovider.pt
diff --git a/src/grokcore/view/ftests/__init__.py → .../tests/base/directoryresource/__init__.py b/src/grokcore/view/ftests/__init__.py → .../tests/base/directoryresource/__init__.py
diff --git a/...s/directoryresource/directoryispackage.py → ...e/directoryresource/directoryispackage.py b/...s/directoryresource/directoryispackage.py → ...e/directoryresource/directoryispackage.py
@@ -4,7 +4,7 @@
 
   >>> import grokcore.view as grok
   >>> grok.testing.grok(
-  ...     'grokcore.view.tests.directoryresource.directoryispackage_fixture')
+  ...     'grokcore.view.tests.base.directoryresource.directoryispackage_fixture')
   Traceback (most recent call last):
     ...
   martian.error.GrokError: The 'foo' resource directory must not be a python package.

diff --git a/...view/ftests/directoryresource/__init__.py → ...ce/directoryispackage_fixture/__init__.py b/...view/ftests/directoryresource/__init__.py → ...ce/directoryispackage_fixture/__init__.py
diff --git a/...sts/directoryresource/fixture/__init__.py → ...irectoryispackage_fixture/foo/__init__.py b/...sts/directoryresource/fixture/__init__.py → ...irectoryispackage_fixture/foo/__init__.py
diff --git a/...ce/directoryispackage_fixture/resource.py → ...ce/directoryispackage_fixture/resource.py b/...ce/directoryispackage_fixture/resource.py → ...ce/directoryispackage_fixture/resource.py
diff --git a/...s/directoryresource/directoryresources.py → ...e/directoryresource/directoryresources.py b/...s/directoryresource/directoryresources.py → ...e/directoryresource/directoryresources.py
@@ -1,18 +1,18 @@
 """
   >>> import grokcore.view as grok
   >>> grok.testing.grok(
-  ...     'grokcore.view.tests.directoryresource.directoryresources_fixture')
+  ...     'grokcore.view.tests.base.directoryresource.directoryresources_fixture')
 
   >>> from zope.interface import Interface
   >>> from zope.component import getAdapter
   >>> from zope.publisher.browser import TestRequest
 
   >>> resource_foo = getAdapter(TestRequest(), Interface, name='foo')
   >>> resource_foo.context.path.replace('\\\\', '/') # Windows compliance 
-  '...grokcore/view/tests/directoryresource/directoryresources_fixture/foo'
+  '...grokcore/view/tests/base/directoryresource/directoryresources_fixture/foo'
 
   >>> resource_baz = getAdapter(TestRequest(), Interface, name='baz')
   >>> resource_baz.context.path.replace('\\\\', '/') # Windows compliance 
-  '...grokcore/view/tests/directoryresource/directoryresources_fixture/bar/baz'
+  '...grokcore/view/tests/base/directoryresource/directoryresources_fixture/bar/baz'
 
 """
diff --git a/...ce/directoryresources_fixture/__init__.py → ...ce/directoryresources_fixture/__init__.py b/...ce/directoryresources_fixture/__init__.py → ...ce/directoryresources_fixture/__init__.py
diff --git a/...sources_fixture/bar/baz/resourceinbaz.txt → ...sources_fixture/bar/baz/resourceinbaz.txt b/...sources_fixture/bar/baz/resourceinbaz.txt → ...sources_fixture/bar/baz/resourceinbaz.txt
diff --git a/...ryresources_fixture/foo/resourceinfoo.txt → ...ryresources_fixture/foo/resourceinfoo.txt b/...ryresources_fixture/foo/resourceinfoo.txt → ...ryresources_fixture/foo/resourceinfoo.txt
diff --git a/...ce/directoryresources_fixture/resource.py → ...ce/directoryresources_fixture/resource.py b/...ce/directoryresources_fixture/resource.py → ...ce/directoryresources_fixture/resource.py
diff --git a/src/grokcore/view/tests/skin/__init__.py → ...grokcore/view/tests/base/skin/__init__.py b/src/grokcore/view/tests/skin/__init__.py → ...grokcore/view/tests/base/skin/__init__.py
diff --git a/src/grokcore/view/tests/skin/conflict.py → ...grokcore/view/tests/base/skin/conflict.py b/src/grokcore/view/tests/skin/conflict.py → ...grokcore/view/tests/base/skin/conflict.py
diff --git a/src/grokcore/view/tests/skin/directive.py → ...rokcore/view/tests/base/skin/directive.py b/src/grokcore/view/tests/skin/directive.py → ...rokcore/view/tests/base/skin/directive.py
@@ -7,7 +7,7 @@
 Import -- and thus "execute" -- the skindirective fixture to make the
 directive have effect::
 
-  >>> from grokcore.view.tests.skin import directive_fixture
+  >>> from grokcore.view.tests.base.skin import directive_fixture
 
   >>> import grokcore.view as grok
   >>> grok.skin.bind().get(directive_fixture.IIsAnInterface)
@@ -19,7 +19,7 @@
 retrieve data will fail due to the way the directive's store is
 implemented::
 
-  >>> from grokcore.view.tests.skin import directive_onaclass_fixture
+  >>> from grokcore.view.tests.base.skin import directive_onaclass_fixture
 
   >>> grok.skin.bind().get(directive_onaclass_fixture.NotAnInterfaceClass)
   Traceback (most recent call last):
@@ -29,7 +29,7 @@
 
 Note that the directive only supports text (ASCII string or unicode):
 
-  >>> from grokcore.view.tests.skin import directive_textonly_fixture
+  >>> from grokcore.view.tests.base.skin import directive_textonly_fixture
   Traceback (most recent call last):
     ...
   martian.error.GrokImportError: The 'skin' directive can only be called with\

diff --git a/...core/view/tests/skin/directive_fixture.py → ...view/tests/base/skin/directive_fixture.py b/...core/view/tests/skin/directive_fixture.py → ...view/tests/base/skin/directive_fixture.py
diff --git a/.../tests/skin/directive_onaclass_fixture.py → ...s/base/skin/directive_onaclass_fixture.py b/.../tests/skin/directive_onaclass_fixture.py → ...s/base/skin/directive_onaclass_fixture.py
diff --git a/.../tests/skin/directive_textonly_fixture.py → ...s/base/skin/directive_textonly_fixture.py b/.../tests/skin/directive_textonly_fixture.py → ...s/base/skin/directive_textonly_fixture.py
diff --git a/src/grokcore/view/tests/skin/nodouble.py → ...grokcore/view/tests/base/skin/nodouble.py b/src/grokcore/view/tests/skin/nodouble.py → ...grokcore/view/tests/base/skin/nodouble.py
@@ -1,7 +1,7 @@
 """
 We cannot register two skins under the same name::
 
-    >>> from grokcore.view.tests.skin import nodouble_fixture
+    >>> from grokcore.view.tests.base.skin import nodouble_fixture
     Traceback (most recent call last):
     ...
     martian.error.GrokImportError: The 'skin' directive can only be called\

diff --git a/...kcore/view/tests/skin/nodouble_fixture.py → .../view/tests/base/skin/nodouble_fixture.py b/...kcore/view/tests/skin/nodouble_fixture.py → .../view/tests/base/skin/nodouble_fixture.py
diff --git a/src/grokcore/view/tests/skin/notonlayer.py → ...okcore/view/tests/base/skin/notonlayer.py b/src/grokcore/view/tests/skin/notonlayer.py → ...okcore/view/tests/base/skin/notonlayer.py
@@ -6,8 +6,8 @@
   Traceback (most recent call last):
     ...
   martian.error.GrokError: The grok.skin() directive is used on interface\
-  'grokcore.view.tests.skin.notonlayer.NotALayer'. However,\
-  'grokcore.view.tests.skin.notonlayer.NotALayer' does not extend\
+  'grokcore.view.tests.base.skin.notonlayer.NotALayer'. However,\
+  'grokcore.view.tests.base.skin.notonlayer.NotALayer' does not extend\
   IRequest which is required for interfaces that are used as\
   layers and are to be registered as a skin.
 """

diff --git a/src/grokcore/view/ftests/url/__init__.py → ...core/view/tests/base/template/__init__.py b/src/grokcore/view/ftests/url/__init__.py → ...core/view/tests/base/template/__init__.py
diff --git a/...grokcore/view/tests/template/lascaux.html → ...ore/view/tests/base/template/lascaux.html b/...grokcore/view/tests/template/lascaux.html → ...ore/view/tests/base/template/lascaux.html
diff --git a/...kcore/view/tests/template/pluggability.py → .../view/tests/base/template/pluggability.py b/...kcore/view/tests/template/pluggability.py → .../view/tests/base/template/pluggability.py
diff --git a/...emplate/pluggability_templates/kakadu.mtl → ...emplate/pluggability_templates/kakadu.mtl b/...emplate/pluggability_templates/kakadu.mtl → ...emplate/pluggability_templates/kakadu.mtl
diff --git a/...emplate/pluggability_templates/sierra.mtl → ...emplate/pluggability_templates/sierra.mtl b/...emplate/pluggability_templates/sierra.mtl → ...emplate/pluggability_templates/sierra.mtl
diff --git a/src/grokcore/view/tests/template/zpt.py → src/grokcore/view/tests/base/template/zpt.py b/src/grokcore/view/tests/template/zpt.py → src/grokcore/view/tests/base/template/zpt.py
diff --git a/.../tests/template/zpt_templates/piepmatz.pt → ...s/base/template/zpt_templates/piepmatz.pt b/.../tests/template/zpt_templates/piepmatz.pt → ...s/base/template/zpt_templates/piepmatz.pt
diff --git a/src/grokcore/view/ftests/static/__init__.py → ...grokcore/view/tests/base/view/__init__.py b/src/grokcore/view/ftests/static/__init__.py → ...grokcore/view/tests/base/view/__init__.py
diff --git a/...kcore/view/tests/view/ambiguouscontext.py → .../view/tests/base/view/ambiguouscontext.py b/...kcore/view/tests/view/ambiguouscontext.py → .../view/tests/base/view/ambiguouscontext.py
@@ -5,7 +5,7 @@
   Traceback (most recent call last):
     ...
   martian.error.GrokError: Multiple possible contexts for\
-  <class 'grokcore.view.tests.view.ambiguouscontext.Club'>, please use the\
+  <class 'grokcore.view.tests.base.view.ambiguouscontext.Club'>, please use the\
   'context' directive.
 
 """

diff --git a/...grokcore/view/tests/view/cross_package.py → ...ore/view/tests/base/view/cross_package.py b/...grokcore/view/tests/view/cross_package.py → ...ore/view/tests/base/view/cross_package.py
@@ -1,27 +1,27 @@
 """
 
-  >>> grok.testing.grok('grokcore.view.tests.view.cross_package_fixture')
+  >>> grok.testing.grok('grokcore.view.tests.base.view.cross_package_fixture')
 
   >>> from grokcore.view import template
   >>> from .cross_package_fixture import zbase
   >>> from .cross_package_fixture.subpackage import sub
   >>> from .cross_package_fixture.subpackage import subtemplatedir
 
   >>> template.bind().get(zbase.BaseView)
-  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+  ('grokcore.view.tests.base.view.cross_package_fixture.zbase', 'basetemplate')
 
   >>> template.bind().get(sub.SubView)
-  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+  ('grokcore.view.tests.base.view.cross_package_fixture.zbase', 'basetemplate')
 
   >>> template.bind().get(sub.SubViewOverrideTemplate)
-  ('grokcore.view.tests.view.cross_package_fixture.subpackage.sub',
+  ('grokcore.view.tests.base.view.cross_package_fixture.subpackage.sub',
    'subtemplate')
 
   >>> template.bind().get(subtemplatedir.MoreSubView)
-  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+  ('grokcore.view.tests.base.view.cross_package_fixture.zbase', 'basetemplate')
 
   >>> template.bind().get(subtemplatedir.MoreSubViewOverrideTemplate)
-  ('grokcore.view.tests.view.cross_package_fixture.subpackage.subtemplatedir',
+  ('grokcore.view.tests.base.view.cross_package_fixture.subpackage.subtemplatedir',
    'moretemplate')
 
 

diff --git a/.../notemplates_nooverridestatic/__init__.py → ...se/view/cross_package_fixture/__init__.py b/.../notemplates_nooverridestatic/__init__.py → ...se/view/cross_package_fixture/__init__.py
diff --git a/...tes_nooverridestatic/original/__init__.py → ...ss_package_fixture/subpackage/__init__.py b/...tes_nooverridestatic/original/__init__.py → ...ss_package_fixture/subpackage/__init__.py
diff --git a/...subpackage/more_templates/moretemplate.pt → ...subpackage/more_templates/moretemplate.pt b/...subpackage/more_templates/moretemplate.pt → ...subpackage/more_templates/moretemplate.pt
diff --git a/src/grokcore/view/tests/base/view/cross_package_fixture/subpackage/sub.py b/src/grokcore/view/tests/base/view/cross_package_fixture/subpackage/sub.py
@@ -0,0 +1,8 @@
+import grokcore.view as grok
+from grokcore.view.tests.base.view.cross_package_fixture.zbase import BaseView
+
+class SubView(BaseView):
+    pass
+
+class SubViewOverrideTemplate(BaseView):
+    grok.template('subtemplate')
diff --git a/...e/subpackage/sub_templates/subtemplate.pt → ...e/subpackage/sub_templates/subtemplate.pt b/...e/subpackage/sub_templates/subtemplate.pt → ...e/subpackage/sub_templates/subtemplate.pt
diff --git a/...kage_fixture/subpackage/subtemplatedir.py → ...kage_fixture/subpackage/subtemplatedir.py b/...kage_fixture/subpackage/subtemplatedir.py → ...kage_fixture/subpackage/subtemplatedir.py
@@ -1,5 +1,5 @@
 import grokcore.view as grok
-from grokcore.view.tests.view.cross_package_fixture.zbase import BaseView
+from grokcore.view.tests.base.view.cross_package_fixture.zbase import BaseView
 
 grok.templatedir('more_templates')
 

diff --git a/...tests/view/cross_package_fixture/zbase.py → .../base/view/cross_package_fixture/zbase.py b/...tests/view/cross_package_fixture/zbase.py → .../base/view/cross_package_fixture/zbase.py
diff --git a/...e_fixture/zbase_templates/basetemplate.pt → ...e_fixture/zbase_templates/basetemplate.pt b/...e_fixture/zbase_templates/basetemplate.pt → ...e_fixture/zbase_templates/basetemplate.pt
diff --git a/...e/view/tests/view/dirandinlinetemplate.py → ...w/tests/base/view/dirandinlinetemplate.py b/...e/view/tests/view/dirandinlinetemplate.py → ...w/tests/base/view/dirandinlinetemplate.py
@@ -8,7 +8,7 @@
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Conflicting\
   templates found for name 'cavepainting': the inline template in\
-  module 'grokcore.view.tests.view.dirandinlinetemplate' conflicts\
+  module 'grokcore.view.tests.base.view.dirandinlinetemplate' conflicts\
   with the file template in directory\
   '...dirandinlinetemplate_templates' in:
 

diff --git a/...dinlinetemplate_templates/cavepainting.pt → ...dinlinetemplate_templates/cavepainting.pt b/...dinlinetemplate_templates/cavepainting.pt → ...dinlinetemplate_templates/cavepainting.pt
diff --git a/src/grokcore/view/tests/view/dirtemplate.py → ...kcore/view/tests/base/view/dirtemplate.py b/src/grokcore/view/tests/view/dirtemplate.py → ...kcore/view/tests/base/view/dirtemplate.py
diff --git a/...iew/dirtemplate_templates/cavepainting.pt → ...iew/dirtemplate_templates/cavepainting.pt b/...iew/dirtemplate_templates/cavepainting.pt → ...iew/dirtemplate_templates/cavepainting.pt
diff --git a/.../tests/view/dirtemplate_templates/food.pt → ...s/base/view/dirtemplate_templates/food.pt b/.../tests/view/dirtemplate_templates/food.pt → ...s/base/view/dirtemplate_templates/food.pt
diff --git a/...e/view/tests/view/dirtemplateandrender.py → ...w/tests/base/view/dirtemplateandrender.py b/...e/view/tests/view/dirtemplateandrender.py → ...w/tests/base/view/dirtemplateandrender.py
@@ -7,7 +7,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Multiple possible ways to render view\
-  <class 'grokcore.view.tests.view.dirtemplateandrender.CavePainting'>.\
+  <class 'grokcore.view.tests.base.view.dirtemplateandrender.CavePainting'>.\
   It has both a 'render' method as well as an associated template.\
   in:
 

diff --git a/...mplateandrender_templates/cavepainting.pt → ...mplateandrender_templates/cavepainting.pt b/...mplateandrender_templates/cavepainting.pt → ...mplateandrender_templates/cavepainting.pt
diff --git a/...kcore/view/tests/view/dirtemplatesonly.py → .../view/tests/base/view/dirtemplatesonly.py b/...kcore/view/tests/view/dirtemplatesonly.py → .../view/tests/base/view/dirtemplatesonly.py
diff --git a/.../dirtemplatesonly_templates/ignored.cache → .../dirtemplatesonly_templates/ignored.cache b/.../dirtemplatesonly_templates/ignored.cache → .../dirtemplatesonly_templates/ignored.cache
diff --git a/.../view/dirtemplatesonly_templates/index.pt → .../view/dirtemplatesonly_templates/index.pt b/.../view/dirtemplatesonly_templates/index.pt → .../view/dirtemplatesonly_templates/index.pt
diff --git a/...ew/dirtemplatesonly_templates/invalid.txt → ...ew/dirtemplatesonly_templates/invalid.txt b/...ew/dirtemplatesonly_templates/invalid.txt → ...ew/dirtemplatesonly_templates/invalid.txt
diff --git a/.../dirtemplatesonly_templates/subdir/.empty → .../dirtemplatesonly_templates/subdir/.empty b/.../dirtemplatesonly_templates/subdir/.empty → .../dirtemplatesonly_templates/subdir/.empty
diff --git a/...view/tests/view/eithertemplateorrender.py → ...tests/base/view/eithertemplateorrender.py b/...view/tests/view/eithertemplateorrender.py → ...tests/base/view/eithertemplateorrender.py
@@ -6,7 +6,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Multiple possible ways to render view\
-  <class 'grokcore.view.tests.view.eithertemplateorrender.CavePainting'>.\
+  <class 'grokcore.view.tests.base.view.eithertemplateorrender.CavePainting'>.\
   It has both a 'render' method as well as an associated template.\
   in:
 """

diff --git a/...s/view/eitherviewtemplateequalorrender.py → ...e/view/eitherviewtemplateequalorrender.py b/...s/view/eitherviewtemplateequalorrender.py → ...e/view/eitherviewtemplateequalorrender.py
@@ -5,7 +5,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Multiple possible ways to render view <class\
-  'grokcore.view.tests.view.eitherviewtemplateequalorrender.CavePainting'>.\
+  'grokcore.view.tests.base.view.eitherviewtemplateequalorrender.CavePainting'>.\
   It has both a 'render' method as well as an associated template.\
   in:
 

diff --git a/...ew/tests/view/explicitimplicittemplate.py → ...sts/base/view/explicitimplicittemplate.py b/...ew/tests/view/explicitimplicittemplate.py → ...sts/base/view/explicitimplicittemplate.py
@@ -8,7 +8,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Multiple possible templates for view\
-  <class 'grokcore.view.tests.view.explicitimplicittemplate.Painting'>.\
+  <class 'grokcore.view.tests.base.view.explicitimplicittemplate.Painting'>.\
   It uses grok.template('cavepainting'), but there is also a template\
   called 'painting'.\
   in:

diff --git a/src/grokcore/view/tests/view/inline.py → src/grokcore/view/tests/base/view/inline.py b/src/grokcore/view/tests/view/inline.py → src/grokcore/view/tests/base/view/inline.py
@@ -15,8 +15,8 @@
   <h1>Mammoth Cave Painting</h1>
   <ul>
     <li><zope.publisher.browser.TestRequest instance URL=http://127.0.0.1></li>
-    <li><grokcore.view.tests.view.inline.CavePainting object at 0x...></li>
-    <li><grokcore.view.tests.view.inline.Mammoth object at 0x...></li>
+    <li><grokcore.view.tests.base.view.inline.CavePainting object at 0x...></li>
+    <li><grokcore.view.tests.base.view.inline.Mammoth object at 0x...></li>
     <li><zope.pagetemplate.engine.TraversableModuleImporter object at 0x...></li>
   </ul>
   </body>

diff --git a/...re/view/tests/view/inline_unassociated.py → ...ew/tests/base/view/inline_unassociated.py b/...re/view/tests/view/inline_unassociated.py → ...ew/tests/base/view/inline_unassociated.py
@@ -11,7 +11,7 @@
   From grok.testing's warn():
     ...
   UserWarning: Found the following unassociated template after configuration\
-  in 'grokcore.view.tests.view.inline_unassociated': club...
+  in 'grokcore.view.tests.base.view.inline_unassociated': club...
 
   >>> warnings.warn = saved_warn
 

diff --git a/src/grokcore/view/tests/view/inlinebogus.py → ...kcore/view/tests/base/view/inlinebogus.py b/src/grokcore/view/tests/view/inlinebogus.py → ...kcore/view/tests/base/view/inlinebogus.py
diff --git a/src/grokcore/view/tests/view/interfacereg.py → ...core/view/tests/base/view/interfacereg.py b/src/grokcore/view/tests/view/interfacereg.py → ...core/view/tests/base/view/interfacereg.py
diff --git a/...rokcore/view/tests/view/missingcontext.py → ...re/view/tests/base/view/missingcontext.py b/...rokcore/view/tests/view/missingcontext.py → ...re/view/tests/base/view/missingcontext.py
@@ -5,7 +5,7 @@
   Traceback (most recent call last):
     ...
   martian.error.GrokError: No module-level context for\
-  <class 'grokcore.view.tests.view.missingcontext.Club'>, please use the\
+  <class 'grokcore.view.tests.base.view.missingcontext.Club'>, please use the\
   'context' directive.
 
 """

diff --git a/...w/tests/view/modequalspkgname/__init__.py → ...ts/base/view/modequalspkgname/__init__.py b/...w/tests/view/modequalspkgname/__init__.py → ...ts/base/view/modequalspkgname/__init__.py
diff --git a/...view/modequalspkgname/modequalspkgname.py → ...view/modequalspkgname/modequalspkgname.py b/...view/modequalspkgname/modequalspkgname.py → ...view/modequalspkgname/modequalspkgname.py
diff --git a/...gname/modequalspkgname_templates/index.pt → ...gname/modequalspkgname_templates/index.pt b/...gname/modequalspkgname_templates/index.pt → ...gname/modequalspkgname_templates/index.pt
diff --git a/src/grokcore/view/tests/view/namemultiple.py → ...core/view/tests/base/view/namemultiple.py b/src/grokcore/view/tests/view/namemultiple.py → ...core/view/tests/base/view/namemultiple.py
@@ -1,7 +1,7 @@
 """
 You can't call grok.name multiple times for a view
 
-  >>> import grokcore.view.tests.view.namemultiple_fixture
+  >>> import grokcore.view.tests.base.view.namemultiple_fixture
   Traceback (most recent call last):
     ...
   martian.error.GrokImportError: The 'name' directive can only be\

diff --git a/...e/view/tests/view/namemultiple_fixture.py → ...w/tests/base/view/namemultiple_fixture.py b/...e/view/tests/view/namemultiple_fixture.py → ...w/tests/base/view/namemultiple_fixture.py
diff --git a/src/grokcore/view/tests/view/nameunicode.py → ...kcore/view/tests/base/view/nameunicode.py b/src/grokcore/view/tests/view/nameunicode.py → ...kcore/view/tests/base/view/nameunicode.py
diff --git a/src/grokcore/view/tests/view/nomodulename.py → ...core/view/tests/base/view/nomodulename.py b/src/grokcore/view/tests/view/nomodulename.py → ...core/view/tests/base/view/nomodulename.py
@@ -1,7 +1,7 @@
 """
 You can't call grok.name on a module:
 
-  >>> import grokcore.view.tests.view.nomodulename_fixture
+  >>> import grokcore.view.tests.base.view.nomodulename_fixture
   Traceback (most recent call last):
     ...
   martian.error.GrokImportError: The 'name' directive can only be used on\

diff --git a/...e/view/tests/view/nomodulename_fixture.py → ...w/tests/base/view/nomodulename_fixture.py b/...e/view/tests/view/nomodulename_fixture.py → ...w/tests/base/view/nomodulename_fixture.py
diff --git a/...ore/view/tests/view/notemplateorrender.py → ...iew/tests/base/view/notemplateorrender.py b/...ore/view/tests/view/notemplateorrender.py → ...iew/tests/base/view/notemplateorrender.py
@@ -6,7 +6,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: View\
-  <class 'grokcore.view.tests.view.notemplateorrender.CavePainting'>\
+  <class 'grokcore.view.tests.base.view.notemplateorrender.CavePainting'>\
   has no associated template or 'render' method.\
   in:
 

diff --git a/...re/view/tests/view/shared_template_dir.py → ...ew/tests/base/view/shared_template_dir.py b/...re/view/tests/view/shared_template_dir.py → ...ew/tests/base/view/shared_template_dir.py
@@ -7,12 +7,12 @@
   >>> saved_warn = warnings.warn
   >>> warnings.warn = warn
 
-  >>> from grokcore.view.tests.view import shared_template_fixture
+  >>> from grokcore.view.tests.base.view import shared_template_fixture
 
   >>> grok.testing.grok(shared_template_fixture.__name__)
   From grok.testing's warn():
   ...UserWarning: Found the following unassociated template after configuration in
-  'grokcore.view.tests.view.shared_template_fixture.first_module': unassociated_instance...
+  'grokcore.view.tests.base.view.shared_template_fixture.first_module': unassociated_instance...
   ...UserWarning: Found the following unassociated template after configuration:
   ...shared_template_fixture...templates...unassociated.pt...
 

diff --git a/.../view/shared_template_fixture/__init__.py → .../view/shared_template_fixture/__init__.py b/.../view/shared_template_fixture/__init__.py → .../view/shared_template_fixture/__init__.py
diff --git a/...w/shared_template_fixture/first_module.py → ...w/shared_template_fixture/first_module.py b/...w/shared_template_fixture/first_module.py → ...w/shared_template_fixture/first_module.py
diff --git a/.../shared_template_fixture/second_module.py → .../shared_template_fixture/second_module.py b/.../shared_template_fixture/second_module.py → .../shared_template_fixture/second_module.py
diff --git a/...emplate_fixture/templates/cavepainting.pt → ...emplate_fixture/templates/cavepainting.pt b/...emplate_fixture/templates/cavepainting.pt → ...emplate_fixture/templates/cavepainting.pt
diff --git a/...shared_template_fixture/templates/food.pt → ...shared_template_fixture/templates/food.pt b/...shared_template_fixture/templates/food.pt → ...shared_template_fixture/templates/food.pt
diff --git a/src/grokcore/view/tests/base/view/shared_template_fixture/templates/unassociated.pt b/src/grokcore/view/tests/base/view/shared_template_fixture/templates/unassociated.pt
@@ -0,0 +1,3 @@
+This template does not have an associated view class (in other words,
+there's no grokcore.view.tests.base.view.shared_template_dir.Unassociated class), therefore it
+provokes a UserWarning.
diff --git a/src/grokcore/view/tests/view/template.py → ...grokcore/view/tests/base/view/template.py b/src/grokcore/view/tests/view/template.py → ...grokcore/view/tests/base/view/template.py
diff --git a/...core/view/tests/view/templatedirectory.py → ...view/tests/base/view/templatedirectory.py b/...core/view/tests/view/templatedirectory.py → ...view/tests/base/view/templatedirectory.py
diff --git a/...s/view/templatedirectory_with_path_sep.py → ...e/view/templatedirectory_with_path_sep.py b/...s/view/templatedirectory_with_path_sep.py → ...e/view/templatedirectory_with_path_sep.py
@@ -1,7 +1,7 @@
 """
 You can not use path separator in templatedir directive:
 
-  >>> import grokcore.view.tests.view.templatedirectory_with_path_sep_fixture
+  >>> import grokcore.view.tests.base.view.templatedirectory_with_path_sep_fixture
   Traceback (most recent call last):
     ...
   martian.error.GrokImportError: The 'templatedir' directive can not\

diff --git a/...emplatedirectory_with_path_sep_fixture.py → ...emplatedirectory_with_path_sep_fixture.py b/...emplatedirectory_with_path_sep_fixture.py → ...emplatedirectory_with_path_sep_fixture.py
diff --git a/.../tests/view/templatedirectoryname/food.pt → ...s/base/view/templatedirectoryname/food.pt b/.../tests/view/templatedirectoryname/food.pt → ...s/base/view/templatedirectoryname/food.pt
diff --git a/...w/tests/view/templatedirectorynotfound.py → ...ts/base/view/templatedirectorynotfound.py b/...w/tests/view/templatedirectorynotfound.py → ...ts/base/view/templatedirectorynotfound.py
@@ -3,7 +3,7 @@
 error:
 
   >>> grok.testing.grok(
-  ...     'grokcore.view.tests.view.templatedirectorynotfound_fixture')
+  ...     'grokcore.view.tests.base.view.templatedirectorynotfound_fixture')
   Traceback (most recent call last):
   ...
   martian.error.GrokImportError: The directory 'idontexit' specified by the\

diff --git a/...view/templatedirectorynotfound_fixture.py → ...view/templatedirectorynotfound_fixture.py b/...view/templatedirectorynotfound_fixture.py → ...view/templatedirectorynotfound_fixture.py
diff --git a/src/grokcore/view/tests/view/templatefile.py → ...core/view/tests/base/view/templatefile.py b/src/grokcore/view/tests/view/templatefile.py → ...core/view/tests/base/view/templatefile.py
diff --git a/...kcore/view/tests/view/templatenotfound.py → .../view/tests/base/view/templatenotfound.py b/...kcore/view/tests/view/templatenotfound.py → .../view/tests/base/view/templatenotfound.py
@@ -7,7 +7,7 @@
     ...
   zope.configuration.config.ConfigurationExecutionError:\
   martian.error.GrokError: Template cavepainting for View\
-  <class 'grokcore.view.tests.view.templatenotfound.Painting'>\
+  <class 'grokcore.view.tests.base.view.templatenotfound.Painting'>\
   cannot be found.\
   in:
 """

diff --git a/...rokcore/view/tests/view/templatereload.py → ...re/view/tests/base/view/templatereload.py b/...rokcore/view/tests/view/templatereload.py → ...re/view/tests/base/view/templatereload.py
diff --git a/...ts/view/templatereload_templates/index.pt → ...se/view/templatereload_templates/index.pt b/...ts/view/templatereload_templates/index.pt → ...se/view/templatereload_templates/index.pt
diff --git a/...view/tests/view/templates/cavepainting.pt → ...tests/base/view/templates/cavepainting.pt b/...view/tests/view/templates/cavepainting.pt → ...tests/base/view/templates/cavepainting.pt
diff --git a/...re/view/tests/view/twoviewsusetemplate.py → ...ew/tests/base/view/twoviewsusetemplate.py b/...re/view/tests/view/twoviewsusetemplate.py → ...ew/tests/base/view/twoviewsusetemplate.py
@@ -33,7 +33,7 @@
   Traceback (most recent call last):
     ...
   zope.interface.interfaces.ComponentLookupError:\
-  ((<grokcore.view.tests.view.twoviewsusetemplate.Mammoth object at 0x...>,\
+  ((<grokcore.view.tests.base.view.twoviewsusetemplate.Mammoth object at 0x...>,\
   <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>),\
   <InterfaceClass zope.interface.Interface>, 'templ')
 

diff --git a/src/grokcore/view/tests/view/unassociated.py → ...core/view/tests/base/view/unassociated.py b/src/grokcore/view/tests/view/unassociated.py → ...core/view/tests/base/view/unassociated.py
diff --git a/...ests/view/unassociated_templates/index.pt → ...base/view/unassociated_templates/index.pt b/...ests/view/unassociated_templates/index.pt → ...base/view/unassociated_templates/index.pt
@@ -1,3 +1,3 @@
 This template does not have an associated view class (in other words,
-there's no grokcore.view.tests.view.unassociated.Index class), therefore it
+there's no grokcore.view.tests.base.view.unassociated.Index class), therefore it
 provokes a UserWarning.
diff --git a/src/grokcore/view/tests/view/ungrokked.py → ...rokcore/view/tests/base/view/ungrokked.py b/src/grokcore/view/tests/view/ungrokked.py → ...rokcore/view/tests/base/view/ungrokked.py
diff --git a/src/grokcore/view/tests/view/update.py → src/grokcore/view/tests/base/view/update.py b/src/grokcore/view/tests/view/update.py → src/grokcore/view/tests/base/view/update.py
diff --git a/...okcore/view/tests/view/update_redirect.py → ...e/view/tests/base/view/update_redirect.py b/...okcore/view/tests/view/update_redirect.py → ...e/view/tests/base/view/update_redirect.py
diff --git a/src/grokcore/view/tests/view/view.py → src/grokcore/view/tests/base/view/view.py b/src/grokcore/view/tests/view/view.py → src/grokcore/view/tests/base/view/view.py
@@ -34,7 +34,7 @@
   Traceback (most recent call last):
     ...
   zope.interface.interfaces.ComponentLookupError:\
-  ((<grokcore.view.tests.view.view.Mammoth object at 0x...>,\
+  ((<grokcore.view.tests.base.view.view.Mammoth object at 0x...>,\
   <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>),\
   <InterfaceClass zope.interface.Interface>, 'food')
 

diff --git a/...rokcore/view/tests/view/view_decorator.py → ...re/view/tests/base/view/view_decorator.py b/...rokcore/view/tests/view/view_decorator.py → ...re/view/tests/base/view/view_decorator.py
@@ -6,7 +6,7 @@
     ...
   martian.error.GrokError: The @grok.require decorator is used for\
   method 'render' in view\
-  <class 'grokcore.view.tests.view.view_decorator.BogusView'>.\
+  <class 'grokcore.view.tests.base.view.view_decorator.BogusView'>.\
   It may only be used for XML-RPC methods.
 
 

diff --git a/...core/view/tests/view/viewtemplateequal.py → ...view/tests/base/view/viewtemplateequal.py b/...core/view/tests/view/viewtemplateequal.py → ...view/tests/base/view/viewtemplateequal.py
diff --git a/.../view/viewtemplateequal_templates/real.pt → .../view/viewtemplateequal_templates/real.pt b/.../view/viewtemplateequal_templates/real.pt → .../view/viewtemplateequal_templates/real.pt
diff --git a/...ic/notemplates_overridestatic/__init__.py → ...rokcore/view/tests/functional/__init__.py b/...ic/notemplates_overridestatic/__init__.py → ...rokcore/view/tests/functional/__init__.py
diff --git a/...re/view/tests/contentprovider/__init__.py → ...ts/functional/contentprovider/__init__.py b/...re/view/tests/contentprovider/__init__.py → ...ts/functional/contentprovider/__init__.py
diff --git a/...re/view/ftests/contentprovider/context.py → ...sts/functional/contentprovider/context.py b/...re/view/ftests/contentprovider/context.py → ...sts/functional/contentprovider/context.py
diff --git a/...ftests/contentprovider/context_fixture.py → ...tional/contentprovider/context_fixture.py b/...ftests/contentprovider/context_fixture.py → ...tional/contentprovider/context_fixture.py
diff --git a/.../view/ftests/contentprovider/interface.py → ...s/functional/contentprovider/interface.py b/.../view/ftests/contentprovider/interface.py → ...s/functional/contentprovider/interface.py
diff --git a/...tentprovider/interface_templates/index.pt → ...tentprovider/interface_templates/index.pt b/...tentprovider/interface_templates/index.pt → ...tentprovider/interface_templates/index.pt
diff --git a/...core/view/ftests/contentprovider/layer.py → ...tests/functional/contentprovider/layer.py b/...core/view/ftests/contentprovider/layer.py → ...tests/functional/contentprovider/layer.py
diff --git a/...ntentprovider/layer_templates/caveview.pt → ...ntentprovider/layer_templates/caveview.pt b/...ntentprovider/layer_templates/caveview.pt → ...ntentprovider/layer_templates/caveview.pt