- Support an ``onerror`` keyword argument to

  ``pyramid.config.Configurator.scan()``.  This onerror keyword argument is
  passed to ``venusian.Scanner.scan()`` to influence error behavior when
  an exception is raised during scanning.

- Pyramid now requires Venusian 1.0a1 or better to support the ``onerror``
  keyword argument to ``pyramid.config.Configurator.scan``.

- Move test fixtures around so test_config tests are not looking "up"
  for fixtures.

28 files changed, 242 insertions, 130 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 9cf1df931..dd15e313e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,20 @@
+Next release
+============
+
+Features
+--------
+
+- Support an ``onerror`` keyword argument to
+  ``pyramid.config.Configurator.scan()``.  This onerror keyword argument is
+  passed to ``venusian.Scanner.scan()`` to influence error behavior when
+  an exception is raised during scanning.
+
+Dependencies
+------------
+
+- Pyramid now requires Venusian 1.0a1 or better to support the ``onerror``
+  keyword argument to ``pyramid.config.Configurator.scan``.
+
 1.2a3 (2011-08-29)
 ==================
 
diff --git a/TODO.txt b/TODO.txt
index 85d69e052..9c939f94a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,8 +13,6 @@ Should-Have
 Nice-to-Have
 ------------
 
-- Expose ``onerror`` callback to venusian scan (requires venusian >=1.0a1).
-
 - Add a default-view-config-params decorator that can be applied to a class
   which names defaults for method-based view_config decorator options.
 
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index c5a71e1ce..1ecf1d746 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -149,6 +149,11 @@ Minor Feature Additions
   when the ``request.matchdict`` has a value inside it named ``action`` with
   a value of ``edit``.
 
+- Support an ``onerror`` keyword argument to
+  :meth:`pyramid.config.Configurator.scan``.  This argument is passed to
+  :meth:`venusian.Scanner.scan` to influence error behavior when an exception
+  is raised during scanning.
+
 Deprecations
 ------------
 
@@ -254,3 +259,5 @@ Dependency Changes
 - Pyramid now relies on PasteScript >= 1.7.4.  This version contains a
   feature important for allowing flexible logging configuration.
 
+- Pyramid now requires Venusian 1.0a1 or better to support the ``onerror``
+  keyword argument to :meth:`pyramid.config.Configurator.scan`.
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index a335ae049..5e082828f 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -716,7 +716,7 @@ class Configurator(
         return self.manager.pop()
 
     # this is *not* an action method (uses caller_package)
-    def scan(self, package=None, categories=None, **kw):
+    def scan(self, package=None, categories=None, onerror=None, **kw):
         """Scan a Python package and any of its subpackages for objects
         marked with :term:`configuration decoration` such as
         :class:`pyramid.view.view_config`.  Any decorated object found will
@@ -737,6 +737,13 @@ class Configurator(
         documentation for more information about limiting a scan by using an
         explicit set of categories.
 
+        The ``onerror`` argument, if provided, should be a Venusian
+        ``onerror`` callback function.  The onerror function is passed to
+        :meth:`venusian.Scanner.scan` to influence error behavior when an
+        exception is raised during the scanning process.  See the
+        :term:`Venusian` documentation for more information about ``onerror``
+        callbacks.
+
         To perform a ``scan``, Pyramid creates a Venusian ``Scanner`` object.
         The ``kw`` argument represents a set of keyword arguments to pass to
         the Venusian ``Scanner`` object's constructor.  See the
@@ -754,11 +761,11 @@ class Configurator(
         if package is None: # pragma: no cover
             package = caller_package()
 
-        scankw = {'config':self}
-        scankw.update(kw)
+        ctorkw = {'config':self}
+        ctorkw.update(kw)
 
-        scanner = self.venusian.Scanner(**scankw)
-        scanner.scan(package, categories=categories)
+        scanner = self.venusian.Scanner(**ctorkw)
+        scanner.scan(package, categories=categories, onerror=onerror)
 
     def make_wsgi_app(self):
         """ Commits any pending configuration statements, sends a
diff --git a/pyramid/tests/test_config/fixtures/dummy.txt b/pyramid/tests/test_config/files/assets/dummy.txt
index 18832d351..18832d351 100644
--- a/pyramid/tests/test_config/fixtures/dummy.txt
+++ b/pyramid/tests/test_config/files/assets/dummy.txt
diff --git a/pyramid/tests/test_config/files/minimal.pt b/pyramid/tests/test_config/files/minimal.pt
new file mode 100644
index 000000000..693d155ef
--- /dev/null
+++ b/pyramid/tests/test_config/files/minimal.pt
@@ -0,0 +1,3 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+</div>
diff --git a/pyramid/tests/test_config/path/scanerror/__init__.py b/pyramid/tests/test_config/path/scanerror/__init__.py
new file mode 100644
index 000000000..86770ad89
--- /dev/null
+++ b/pyramid/tests/test_config/path/scanerror/__init__.py
@@ -0,0 +1,3 @@
+# scan error package
+
+
diff --git a/pyramid/tests/test_config/path/scanerror/will_raise_error.py b/pyramid/tests/test_config/path/scanerror/will_raise_error.py
new file mode 100644
index 000000000..9098ff1fe
--- /dev/null
+++ b/pyramid/tests/test_config/path/scanerror/will_raise_error.py
@@ -0,0 +1 @@
+import wont.exist
diff --git a/pyramid/tests/test_config/pkgs/__init__.py b/pyramid/tests/test_config/pkgs/__init__.py
new file mode 100644
index 000000000..ed88d78b4
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/__init__.py
@@ -0,0 +1,2 @@
+# package
+
diff --git a/pyramid/tests/test_config/pkgs/asset/__init__.py b/pyramid/tests/test_config/pkgs/asset/__init__.py
new file mode 100644
index 000000000..c74747bfd
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/__init__.py
@@ -0,0 +1,12 @@
+def includeme(config):
+    config.add_view('.views.fixture_view')
+    config.add_view('.views.exception_view', context=RuntimeError)
+    config.add_view('.views.protected_view', name='protected.html')
+    config.add_view('.views.erroneous_view', name='error.html')
+    config.add_view('.views.fixture_view', name='dummyskin.html',
+                    request_type='.views.IDummy')
+    from models import fixture, IFixture
+    config.registry.registerUtility(fixture, IFixture)
+    config.add_view('.views.fixture_view', name='another.html')
+
+    
diff --git a/pyramid/tests/test_config/pkgs/asset/models.py b/pyramid/tests/test_config/pkgs/asset/models.py
new file mode 100644
index 000000000..d80d14bb3
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/models.py
@@ -0,0 +1,8 @@
+from zope.interface import Interface
+
+class IFixture(Interface):
+    pass
+
+def fixture():
+    """ """
+
diff --git a/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py b/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py
new file mode 100644
index 000000000..d3173e636
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py
@@ -0,0 +1 @@
+#package
diff --git a/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt b/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt
new file mode 100644
index 000000000..90531a4b3
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt
@@ -0,0 +1,2 @@
+<html>
+</html>
diff --git a/pyramid/tests/test_config/pkgs/asset/templates/fixture.pt b/pyramid/tests/test_config/pkgs/asset/templates/fixture.pt
new file mode 100644
index 000000000..06dd4e2b1
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/templates/fixture.pt
@@ -0,0 +1,6 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+<head></head>
+<body>
+</body>
+</html>
diff --git a/pyramid/tests/test_config/pkgs/asset/views.py b/pyramid/tests/test_config/pkgs/asset/views.py
new file mode 100644
index 000000000..cbfc5a574
--- /dev/null
+++ b/pyramid/tests/test_config/pkgs/asset/views.py
@@ -0,0 +1,22 @@
+from zope.interface import Interface
+from webob import Response
+from pyramid.httpexceptions import HTTPForbidden
+
+def fixture_view(context, request):
+    """ """
+    return Response('fixture')
+
+def erroneous_view(context, request):
+    """ """
+    raise RuntimeError()
+
+def exception_view(context, request):
+    """ """
+    return Response('supressed')
+
+def protected_view(context, request):
+    """ """
+    raise HTTPForbidden()
+
+class IDummy(Interface):
+    pass
diff --git a/pyramid/tests/venusianapp/__init__.py b/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py
index ce5e07238..ce5e07238 100644
--- a/pyramid/tests/venusianapp/__init__.py
+++ b/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py
diff --git a/pyramid/tests/grokkedapp/__init__.py b/pyramid/tests/test_config/pkgs/scannable/__init__.py
index 562413a41..562413a41 100644
--- a/pyramid/tests/grokkedapp/__init__.py
+++ b/pyramid/tests/test_config/pkgs/scannable/__init__.py
diff --git a/pyramid/tests/grokkedapp/another.py b/pyramid/tests/test_config/pkgs/scannable/another.py
index 529821b5c..529821b5c 100644
--- a/pyramid/tests/grokkedapp/another.py
+++ b/pyramid/tests/test_config/pkgs/scannable/another.py
diff --git a/pyramid/tests/grokkedapp/pod/notinit.py b/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py
index 91dcd161b..91dcd161b 100644
--- a/pyramid/tests/grokkedapp/pod/notinit.py
+++ b/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py
diff --git a/pyramid/tests/grokkedapp/subpackage/__init__.py b/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py
index 9e0ddacbd..9e0ddacbd 100644
--- a/pyramid/tests/grokkedapp/subpackage/__init__.py
+++ b/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py
diff --git a/pyramid/tests/grokkedapp/subpackage/notinit.py b/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py
index f7edd0c68..f7edd0c68 100644
--- a/pyramid/tests/grokkedapp/subpackage/notinit.py
+++ b/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py
diff --git a/pyramid/tests/grokkedapp/subpackage/subsubpackage/__init__.py b/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
index fdda0dffe..fdda0dffe 100644
--- a/pyramid/tests/grokkedapp/subpackage/subsubpackage/__init__.py
+++ b/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
diff --git a/pyramid/tests/selfscanapp/__init__.py b/pyramid/tests/test_config/pkgs/selfscan/__init__.py
index 779ea3eed..779ea3eed 100644
--- a/pyramid/tests/selfscanapp/__init__.py
+++ b/pyramid/tests/test_config/pkgs/selfscan/__init__.py
diff --git a/pyramid/tests/selfscanapp/another.py b/pyramid/tests/test_config/pkgs/selfscan/another.py
index a30ad3297..a30ad3297 100644
--- a/pyramid/tests/selfscanapp/another.py
+++ b/pyramid/tests/test_config/pkgs/selfscan/another.py
diff --git a/pyramid/tests/test_config/test_assets.py b/pyramid/tests/test_config/test_assets.py
index d9d48f333..a7bc59e7e 100644
--- a/pyramid/tests/test_config/test_assets.py
+++ b/pyramid/tests/test_config/test_assets.py
@@ -61,7 +61,7 @@ class TestOverrideProvider(unittest.TestCase):
 
     def test_resource_isdir_no_overrides(self):
         file_resource_name = 'test_assets.py'
-        directory_resource_name = 'fixtures'
+        directory_resource_name = 'files'
         import pyramid.tests.test_config
         provider = self._makeOne(pyramid.tests.test_config)
         result = provider.resource_isdir(file_resource_name)
@@ -70,7 +70,7 @@ class TestOverrideProvider(unittest.TestCase):
         self.assertEqual(result, True)
 
     def test_resource_listdir_no_overrides(self):
-        resource_name = 'fixtures'
+        resource_name = 'files'
         import pyramid.tests.test_config
         provider = self._makeOne(pyramid.tests.test_config)
         result = provider.resource_listdir(resource_name)
@@ -124,7 +124,7 @@ class TestOverrideProvider(unittest.TestCase):
     def test_resource_isdir_override_returns_None(self):
         overrides = DummyOverrides(None)
         self._registerOverrides(overrides)
-        resource_name = 'fixtures'
+        resource_name = 'files'
         import pyramid.tests.test_config
         provider = self._makeOne(pyramid.tests.test_config)
         result = provider.resource_isdir(resource_name)
@@ -133,7 +133,7 @@ class TestOverrideProvider(unittest.TestCase):
     def test_resource_listdir_override_returns_None(self):
         overrides = DummyOverrides(None)
         self._registerOverrides(overrides)
-        resource_name = 'fixtures'
+        resource_name = 'files'
         import pyramid.tests.test_config
         provider = self._makeOne(pyramid.tests.test_config)
         result = provider.resource_listdir(resource_name)
@@ -176,7 +176,7 @@ class TestOverrideProvider(unittest.TestCase):
         import pyramid.tests.test_config
         self._registerOverrides(overrides)
         provider = self._makeOne(pyramid.tests.test_config)
-        result = provider.resource_isdir('fixtures')
+        result = provider.resource_isdir('files')
         self.assertEqual(result, False)
 
     def test_resource_listdir_override_returns_values(self):
@@ -184,7 +184,7 @@ class TestOverrideProvider(unittest.TestCase):
         import pyramid.tests.test_config
         self._registerOverrides(overrides)
         provider = self._makeOne(pyramid.tests.test_config)
-        result = provider.resource_listdir('fixtures')
+        result = provider.resource_listdir('files')
         self.assertEqual(result, ['a'])
 
 class TestPackageOverrides(unittest.TestCase):
@@ -351,7 +351,7 @@ class TestPackageOverrides(unittest.TestCase):
         
     def test_isdir_true(self):
         overrides = [ DummyOverride(
-            ('pyramid.tests.test_config', 'fixtures'))]
+            ('pyramid.tests.test_config', 'files'))]
         package = DummyPackage('package')
         po = self._makeOne(package)
         po.overrides= overrides
@@ -367,7 +367,7 @@ class TestPackageOverrides(unittest.TestCase):
 
     def test_listdir(self):
         overrides = [ DummyOverride(
-            ('pyramid.tests.test_config', 'fixtures'))]
+            ('pyramid.tests.test_config', 'files'))]
         package = DummyPackage('package')
         po = self._makeOne(package)
         po.overrides= overrides
diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index f3ff5aaca..1c1f1ca15 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -278,41 +278,41 @@ class ConfiguratorTests(unittest.TestCase):
         self.assertTrue(view.__wraps__ is exceptionresponse_view)
 
     def test_with_package_module(self):
-        from pyramid.tests import test_configuration
+        from pyramid.tests.test_config import test_init
         import pyramid.tests
         config = self._makeOne()
-        newconfig = config.with_package(test_configuration)
-        self.assertEqual(newconfig.package, pyramid.tests)
+        newconfig = config.with_package(test_init)
+        self.assertEqual(newconfig.package, pyramid.tests.test_config)
 
     def test_with_package_package(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
-        newconfig = config.with_package(pyramid.tests)
-        self.assertEqual(newconfig.package, pyramid.tests)
+        newconfig = config.with_package(pyramid.tests.test_config)
+        self.assertEqual(newconfig.package, pyramid.tests.test_config)
 
     def test_with_package_context_is_not_None(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
         config._ctx = DummyContext()
         config._ctx.registry = None
         config._ctx.autocommit = True
         config._ctx.route_prefix = None
-        newconfig = config.with_package(pyramid.tests)
-        self.assertEqual(newconfig.package, pyramid.tests)
+        newconfig = config.with_package(pyramid.tests.test_config)
+        self.assertEqual(newconfig.package, pyramid.tests.test_config)
 
     def test_with_package_context_is_None(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
         config._ctx = None
-        newconfig = config.with_package(pyramid.tests)
-        self.assertEqual(newconfig.package, pyramid.tests)
+        newconfig = config.with_package(pyramid.tests.test_config)
+        self.assertEqual(newconfig.package, pyramid.tests.test_config)
         self.assertEqual(config._ctx.package, None)
 
     def test_maybe_dotted_string_success(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
-        result = config.maybe_dotted('pyramid.tests')
-        self.assertEqual(result, pyramid.tests)
+        result = config.maybe_dotted('pyramid.tests.test_config')
+        self.assertEqual(result, pyramid.tests.test_config)
 
     def test_maybe_dotted_string_fail(self):
         config = self._makeOne()
@@ -320,28 +320,28 @@ class ConfiguratorTests(unittest.TestCase):
                           config.maybe_dotted, 'cant.be.found')
 
     def test_maybe_dotted_notstring_success(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
-        result = config.maybe_dotted(pyramid.tests)
-        self.assertEqual(result, pyramid.tests)
+        result = config.maybe_dotted(pyramid.tests.test_config)
+        self.assertEqual(result, pyramid.tests.test_config)
 
     def test_absolute_asset_spec_already_absolute(self):
-        import pyramid.tests
-        config = self._makeOne(package=pyramid.tests)
+        import pyramid.tests.test_config
+        config = self._makeOne(package=pyramid.tests.test_config)
         result = config.absolute_asset_spec('already:absolute')
         self.assertEqual(result, 'already:absolute')
 
     def test_absolute_asset_spec_notastring(self):
-        import pyramid.tests
-        config = self._makeOne(package=pyramid.tests)
+        import pyramid.tests.test_config
+        config = self._makeOne(package=pyramid.tests.test_config)
         result = config.absolute_asset_spec(None)
         self.assertEqual(result, None)
 
     def test_absolute_asset_spec_relative(self):
-        import pyramid.tests
-        config = self._makeOne(package=pyramid.tests)
-        result = config.absolute_asset_spec('templates')
-        self.assertEqual(result, 'pyramid.tests:templates')
+        import pyramid.tests.test_config
+        config = self._makeOne(package=pyramid.tests.test_config)
+        result = config.absolute_asset_spec('files')
+        self.assertEqual(result, 'pyramid.tests.test_config:files')
 
     def test__fix_registry_has_listeners(self):
         reg = DummyRegistry()
@@ -493,11 +493,11 @@ class ConfiguratorTests(unittest.TestCase):
         from pyramid.interfaces import IAuthenticationPolicy
         reg = Registry()
         config = self._makeOne(reg)
-        config.setup_registry(authentication_policy='pyramid.tests')
+        config.setup_registry(authentication_policy='pyramid.tests.test_config')
         config.commit()
         result = reg.getUtility(IAuthenticationPolicy)
-        import pyramid.tests
-        self.assertEqual(result, pyramid.tests)
+        import pyramid.tests.test_config
+        self.assertEqual(result, pyramid.tests.test_config)
 
     def test_setup_registry_authorization_policy_dottedname(self):
         from pyramid.registry import Registry
@@ -506,11 +506,11 @@ class ConfiguratorTests(unittest.TestCase):
         config = self._makeOne(reg)
         dummy = object()
         config.setup_registry(authentication_policy=dummy,
-                              authorization_policy='pyramid.tests')
+                              authorization_policy='pyramid.tests.test_config')
         config.commit()
         result = reg.getUtility(IAuthorizationPolicy)
-        import pyramid.tests
-        self.assertEqual(result, pyramid.tests)
+        import pyramid.tests.test_config
+        self.assertEqual(result, pyramid.tests.test_config)
 
     def test_setup_registry_authorization_policy_only(self):
         from zope.configuration.config import ConfigurationExecutionError
@@ -535,23 +535,24 @@ class ConfiguratorTests(unittest.TestCase):
         from pyramid.interfaces import IRootFactory
         reg = Registry()
         config = self._makeOne(reg)
-        import pyramid.tests
-        config.setup_registry(root_factory='pyramid.tests')
+        import pyramid.tests.test_config
+        config.setup_registry(root_factory='pyramid.tests.test_config')
         self.assertEqual(reg.queryUtility(IRootFactory), None)
         config.commit()
-        self.assertEqual(reg.getUtility(IRootFactory), pyramid.tests)
+        self.assertEqual(reg.getUtility(IRootFactory),
+                         pyramid.tests.test_config)
 
     def test_setup_registry_locale_negotiator_dottedname(self):
         from pyramid.registry import Registry
         from pyramid.interfaces import ILocaleNegotiator
         reg = Registry()
         config = self._makeOne(reg)
-        import pyramid.tests
-        config.setup_registry(locale_negotiator='pyramid.tests')
+        import pyramid.tests.test_config
+        config.setup_registry(locale_negotiator='pyramid.tests.test_config')
         self.assertEqual(reg.queryUtility(ILocaleNegotiator), None)
         config.commit()
         utility = reg.getUtility(ILocaleNegotiator)
-        self.assertEqual(utility, pyramid.tests)
+        self.assertEqual(utility, pyramid.tests.test_config)
 
     def test_setup_registry_locale_negotiator(self):
         from pyramid.registry import Registry
@@ -582,12 +583,12 @@ class ConfiguratorTests(unittest.TestCase):
         from pyramid.interfaces import IRequestFactory
         reg = Registry()
         config = self._makeOne(reg)
-        import pyramid.tests
-        config.setup_registry(request_factory='pyramid.tests')
+        import pyramid.tests.test_config
+        config.setup_registry(request_factory='pyramid.tests.test_config')
         self.assertEqual(reg.queryUtility(IRequestFactory), None)
         config.commit()
         utility = reg.getUtility(IRequestFactory)
-        self.assertEqual(utility, pyramid.tests)
+        self.assertEqual(utility, pyramid.tests.test_config)
 
     def test_setup_registry_renderer_globals_factory(self):
         import warnings
@@ -614,12 +615,13 @@ class ConfiguratorTests(unittest.TestCase):
             from pyramid.interfaces import IRendererGlobalsFactory
             reg = Registry()
             config = self._makeOne(reg)
-            import pyramid.tests
-            config.setup_registry(renderer_globals_factory='pyramid.tests')
+            import pyramid.tests.test_config
+            config.setup_registry(
+                renderer_globals_factory='pyramid.tests.test_config')
             self.assertEqual(reg.queryUtility(IRendererGlobalsFactory), None)
             config.commit()
             utility = reg.getUtility(IRendererGlobalsFactory)
-            self.assertEqual(utility, pyramid.tests)
+            self.assertEqual(utility, pyramid.tests.test_config)
         finally:
             warnings.resetwarnings()
 
@@ -807,9 +809,10 @@ pyramid.tests.test_config.dummy_include2""",
 
     def test_add_tween_unsuitable(self):
         from pyramid.exceptions import ConfigurationError
-        import pyramid.tests
+        import pyramid.tests.test_config
         config = self._makeOne()
-        self.assertRaises(ConfigurationError, config.add_tween, pyramid.tests)
+        self.assertRaises(ConfigurationError, config.add_tween,
+                          pyramid.tests.test_config)
 
     def test_add_tween_name_ingress(self):
         from pyramid.exceptions import ConfigurationError
@@ -909,15 +912,15 @@ pyramid.tests.test_config.dummy_include2""",
         self.assertEqual(len(L), 1)
 
     def test_add_subscriber_dottednames(self):
-        import pyramid.tests
+        import pyramid.tests.test_config
         from pyramid.interfaces import INewRequest
         config = self._makeOne(autocommit=True)
-        config.add_subscriber('pyramid.tests',
+        config.add_subscriber('pyramid.tests.test_config',
                               'pyramid.interfaces.INewRequest')
         handlers = list(config.registry.registeredHandlers())
         self.assertEqual(len(handlers), 1)
         handler = handlers[0]
-        self.assertEqual(handler.handler, pyramid.tests)
+        self.assertEqual(handler.handler, pyramid.tests.test_config)
         self.assertEqual(handler.required, (INewRequest,))
 
     def test_add_object_event_subscriber(self):
@@ -1862,7 +1865,7 @@ pyramid.tests.test_config.dummy_include2""",
                 return {'a':'1'}
         config = self._makeOne(autocommit=True)
         renderer = self._registerRenderer(config)
-        fixture = 'pyramid.tests:fixtures/minimal.txt'
+        fixture = 'pyramid.tests.test_config:files/minimal.txt'
         config.add_view(view=view, renderer=fixture)
         wrapper = self._getViewCallable(config)
         request = self._makeRequest(config)
@@ -1902,7 +1905,7 @@ pyramid.tests.test_config.dummy_include2""",
         from pyramid.interfaces import ISettings
         config = self._makeOne(autocommit=True)
         renderer = self._registerRenderer(config)
-        fixture = 'pyramid.tests:fixtures/minimal.txt'
+        fixture = 'pyramid.tests.test_config:files/minimal.txt'
         config.add_view(view=None, renderer=fixture)
         wrapper = self._getViewCallable(config)
         request = self._makeRequest(config)
@@ -2625,7 +2628,7 @@ pyramid.tests.test_config.dummy_include2""",
         from pyramid.interfaces import IView
         from pyramid.interfaces import IViewClassifier
         config = self._makeOne(autocommit=True)
-        config.add_static_view('static', 'fixtures/static',
+        config.add_static_view('static', 'files',
                                renderer=null_renderer)
         request_type = self._getRouteRequestIface(config, 'static/')
         self._assertRoute(config, 'static/', 'static/*subpath')
@@ -2640,20 +2643,21 @@ pyramid.tests.test_config.dummy_include2""",
         info = DummyStaticURLInfo()
         config = self._makeOne(autocommit=True)
         config.registry.registerUtility(info, IStaticURLInfo)
-        config.add_static_view('static', 'pyramid.tests:fixtures/static')
+        config.add_static_view('static',
+                               'pyramid.tests.test_config:files')
         self.assertEqual(
             info.added,
-            [('static', 'pyramid.tests:fixtures/static', {})])
+            [('static', 'pyramid.tests.test_config:files', {})])
 
     def test_add_static_view_package_here_relative(self):
         from pyramid.interfaces import IStaticURLInfo
         info = DummyStaticURLInfo()
         config = self._makeOne(autocommit=True)
         config.registry.registerUtility(info, IStaticURLInfo)
-        config.add_static_view('static', 'fixtures/static')
+        config.add_static_view('static', 'files')
         self.assertEqual(
             info.added,
-            [('static', 'pyramid.tests.test_config:fixtures/static', {})])
+            [('static', 'pyramid.tests.test_config:files', {})])
 
     def test_add_static_view_absolute(self):
         import os
@@ -2662,7 +2666,7 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         config.registry.registerUtility(info, IStaticURLInfo)
         here = os.path.dirname(__file__)
-        static_path = os.path.join(here, 'fixtures', 'static')
+        static_path = os.path.join(here, 'files')
         config.add_static_view('static', static_path)
         self.assertEqual(info.added,
                          [('static', static_path, {})])
@@ -2707,7 +2711,7 @@ pyramid.tests.test_config.dummy_include2""",
         view = lambda *arg: {}
         config.set_notfound_view(
             view,
-            renderer='pyramid.tests:fixtures/minimal.pt')
+            renderer='pyramid.tests.test_config:files/minimal.pt')
         config.begin()
         try: # chameleon depends on being able to find a threadlocal registry
             request = self._makeRequest(config)
@@ -2759,7 +2763,7 @@ pyramid.tests.test_config.dummy_include2""",
         view = lambda *arg: {}
         config.set_forbidden_view(
             view,
-            renderer='pyramid.tests:fixtures/minimal.pt')
+            renderer='pyramid.tests.test_config:files/minimal.pt')
         config.begin()
         try: # chameleon requires a threadlocal registry
             request = self._makeRequest(config)
@@ -2935,12 +2939,12 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         override = DummyUnderOverride()
         config.override_asset(
-            'pyramid.tests.fixtureapp:templates/foo.pt',
-            'pyramid.tests.fixtureapp.subpackage:templates/bar.pt',
+            'pyramid.tests.test_config.pkgs.asset:templates/foo.pt',
+            'pyramid.tests.test_config.pkgs.asset.subpackage:templates/bar.pt',
             _override=override)
-        from pyramid.tests import fixtureapp
-        from pyramid.tests.fixtureapp import subpackage
-        self.assertEqual(override.package, fixtureapp)
+        from pyramid.tests.test_config.pkgs import asset
+        from pyramid.tests.test_config.pkgs.asset import subpackage
+        self.assertEqual(override.package, asset)
         self.assertEqual(override.path, 'templates/foo.pt')
         self.assertEqual(override.override_package, subpackage)
         self.assertEqual(override.override_prefix, 'templates/bar.pt')
@@ -2949,12 +2953,12 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         override = DummyUnderOverride()
         config.override_asset(
-            'pyramid.tests.fixtureapp',
-            'pyramid.tests.fixtureapp.subpackage',
+            'pyramid.tests.test_config.pkgs.asset',
+            'pyramid.tests.test_config.pkgs.asset.subpackage',
             _override=override)
-        from pyramid.tests import fixtureapp
-        from pyramid.tests.fixtureapp import subpackage
-        self.assertEqual(override.package, fixtureapp)
+        from pyramid.tests.test_config.pkgs import asset
+        from pyramid.tests.test_config.pkgs.asset import subpackage
+        self.assertEqual(override.package, asset)
         self.assertEqual(override.path, '')
         self.assertEqual(override.override_package, subpackage)
         self.assertEqual(override.override_prefix, '')
@@ -2963,12 +2967,12 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         override = DummyUnderOverride()
         config.override_asset(
-            'pyramid.tests.fixtureapp:templates/',
-            'pyramid.tests.fixtureapp.subpackage:templates/',
+            'pyramid.tests.test_config.pkgs.asset:templates/',
+            'pyramid.tests.test_config.pkgs.asset.subpackage:templates/',
             _override=override)
-        from pyramid.tests import fixtureapp
-        from pyramid.tests.fixtureapp import subpackage
-        self.assertEqual(override.package, fixtureapp)
+        from pyramid.tests.test_config.pkgs import asset
+        from pyramid.tests.test_config.pkgs.asset import subpackage
+        self.assertEqual(override.package, asset)
         self.assertEqual(override.path, 'templates/')
         self.assertEqual(override.override_package, subpackage)
         self.assertEqual(override.override_prefix, 'templates/')
@@ -2977,12 +2981,12 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         override = DummyUnderOverride()
         config.override_asset(
-            'pyramid.tests.fixtureapp:templates/',
-            'pyramid.tests.fixtureapp.subpackage',
+            'pyramid.tests.test_config.pkgs.asset:templates/',
+            'pyramid.tests.test_config.pkgs.asset.subpackage',
             _override=override)
-        from pyramid.tests import fixtureapp
-        from pyramid.tests.fixtureapp import subpackage
-        self.assertEqual(override.package, fixtureapp)
+        from pyramid.tests.test_config.pkgs import asset
+        from pyramid.tests.test_config.pkgs.asset import subpackage
+        self.assertEqual(override.package, asset)
         self.assertEqual(override.path, 'templates/')
         self.assertEqual(override.override_package, subpackage)
         self.assertEqual(override.override_prefix, '')
@@ -2991,12 +2995,12 @@ pyramid.tests.test_config.dummy_include2""",
         config = self._makeOne(autocommit=True)
         override = DummyUnderOverride()
         config.override_asset(
-            'pyramid.tests.fixtureapp',
-            'pyramid.tests.fixtureapp.subpackage:templates/',
+            'pyramid.tests.test_config.pkgs.asset',
+            'pyramid.tests.test_config.pkgs.asset.subpackage:templates/',
             _override=override)
-        from pyramid.tests import fixtureapp
-        from pyramid.tests.fixtureapp import subpackage
-        self.assertEqual(override.package, fixtureapp)
+        from pyramid.tests.test_config.pkgs import asset
+        from pyramid.tests.test_config.pkgs.asset import subpackage
+        self.assertEqual(override.package, asset)
         self.assertEqual(override.path, '')
         self.assertEqual(override.override_package, subpackage)
         self.assertEqual(override.override_prefix, 'templates/')
@@ -3012,10 +3016,10 @@ pyramid.tests.test_config.dummy_include2""",
     def test_add_renderer_dottedname_factory(self):
         from pyramid.interfaces import IRendererFactory
         config = self._makeOne(autocommit=True)
-        import pyramid.tests
-        config.add_renderer('name', 'pyramid.tests')
+        import pyramid.tests.test_config
+        config.add_renderer('name', 'pyramid.tests.test_config')
         self.assertEqual(config.registry.getUtility(IRendererFactory, 'name'),
-                         pyramid.tests)
+                         pyramid.tests.test_config)
 
     def test_add_response_adapter(self):
         from pyramid.interfaces import IResponse
@@ -3050,7 +3054,7 @@ pyramid.tests.test_config.dummy_include2""",
         from zope.interface import alsoProvides
         from pyramid.interfaces import IRequest
         from pyramid.view import render_view_to_response
-        import pyramid.tests.grokkedapp as package
+        import pyramid.tests.test_config.pkgs.scannable as package
         config = self._makeOne(autocommit=True)
         config.scan(package)
 
@@ -3154,7 +3158,7 @@ pyramid.tests.test_config.dummy_include2""",
         from pyramid.interfaces import IRequest
         from pyramid.view import render_view_to_response
         config = self._makeOne(autocommit=True)
-        config.scan('pyramid.tests.grokkedapp')
+        config.scan('pyramid.tests.test_config.pkgs.scannable')
 
         ctx = DummyContext()
         req = DummyRequest()
@@ -3167,9 +3171,49 @@ pyramid.tests.test_config.dummy_include2""",
 
     def test_scan_integration_with_extra_kw(self):
         config = self._makeOne(autocommit=True)
-        config.scan('pyramid.tests.venusianapp', a=1)
+        config.scan('pyramid.tests.test_config.pkgs.scanextrakw', a=1)
         self.assertEqual(config.a, 1)
 
+    def test_scan_integration_with_onerror(self):
+        # fancy sys.path manipulation here to appease "setup.py test" which
+        # fails miserably when it can't import something in the package
+        import sys
+        try:
+            here = os.path.dirname(__file__)
+            path = os.path.join(here, 'path')
+            sys.path.append(path)
+            config = self._makeOne(autocommit=True)
+            class FooException(Exception):
+                pass
+            def onerror(name):
+                raise FooException
+            self.assertRaises(FooException, config.scan, 'scanerror',
+                              onerror=onerror)
+        finally:
+            sys.path.remove(path)
+
+    def test_scan_integration_conflict(self):
+        from zope.configuration.config import ConfigurationConflictError
+        from pyramid.tests.test_config.pkgs import selfscan
+        from pyramid.config import Configurator
+        c = Configurator()
+        c.scan(selfscan)
+        c.scan(selfscan)
+        try:
+            c.commit()
+        except ConfigurationConflictError, why:
+            def scanconflicts(e):
+                conflicts = e._conflicts.values()
+                for conflict in conflicts:
+                    for confinst in conflict:
+                        yield confinst[3]
+            which = list(scanconflicts(why))
+            self.assertEqual(len(which), 4)
+            self.assertTrue("@view_config(renderer='string')" in which)
+            self.assertTrue("@view_config(name='two', renderer='string')" in
+                            which)
+
+
     def test_testing_securitypolicy(self):
         from pyramid.testing import DummySecurityPolicy
         config = self._makeOne(autocommit=True)
@@ -3455,27 +3499,6 @@ pyramid.tests.test_config.dummy_include2""",
         else: # pragma: no cover
             raise AssertionError
 
-    def test_scan_conflict(self):
-        from zope.configuration.config import ConfigurationConflictError
-        from pyramid.tests import selfscanapp
-        from pyramid.config import Configurator
-        c = Configurator()
-        c.scan(selfscanapp)
-        c.scan(selfscanapp)
-        try:
-            c.commit()
-        except ConfigurationConflictError, why:
-            def scanconflicts(e):
-                conflicts = e._conflicts.values()
-                for conflict in conflicts:
-                    for confinst in conflict:
-                        yield confinst[3]
-            which = list(scanconflicts(why))
-            self.assertEqual(len(which), 4)
-            self.assertTrue("@view_config(renderer='string')" in which)
-            self.assertTrue("@view_config(name='two', renderer='string')" in
-                            which)
-
     def test___getattr__missing_when_directives_exist(self):
         config = self._makeOne()
         directives = {}
@@ -3645,7 +3668,7 @@ class TestConfiguratorDeprecatedFeatures(unittest.TestCase):
         self._registerRenderer(config)
         view = lambda *arg: 'OK'
         config.add_route('name', 'path', view=view,
-                         view_renderer='fixtures/minimal.txt')
+                         view_renderer='files/minimal.txt')
         request_type = self._getRouteRequestIface(config, 'name')
         wrapper = self._getViewCallable(config, None, request_type)
         self._assertRoute(config, 'name', 'path')
@@ -3673,7 +3696,7 @@ class TestConfiguratorDeprecatedFeatures(unittest.TestCase):
         self._registerRenderer(config)
         view = lambda *arg: 'OK'
         config.add_route('name', 'path', view=view,
-                         renderer='fixtures/minimal.txt')
+                         renderer='files/minimal.txt')
         request_type = self._getRouteRequestIface(config, 'name')
         wrapper = self._getViewCallable(config, None, request_type)
         self._assertRoute(config, 'name', 'path')
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index f42e6425d..230a0a411 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -437,7 +437,7 @@ class ImperativeIncludeConfigurationTest(unittest.TestCase):
 
 class SelfScanAppTest(unittest.TestCase):
     def setUp(self):
-        from pyramid.tests.selfscanapp import main
+        from pyramid.tests.test_config.pkgs.selfscan import main
         config = main()
         app = config.make_wsgi_app()
         from webtest import TestApp
diff --git a/setup.py b/setup.py
index 75f8d16c0..4d32db715 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ install_requires=[
     'zope.configuration',
     'zope.deprecation',
     'zope.interface >= 3.5.1',  # 3.5.0 comment: "allow to bootstrap on jython"
-    'venusian >= 0.5', # ``codeinfo``
+    'venusian >= 1.0a1', # ``onerror``
     'translationstring',
     ]