Allow ``zcml_configure`` value to override the package.

3 files changed, 22 insertions, 0 deletions

diff --git a/repoze/bfg/tests/fixtureapp/subpackage/__init__.py b/repoze/bfg/tests/fixtureapp/subpackage/__init__.py
new file mode 100644
index 000000000..d3173e636
--- /dev/null
+++ b/repoze/bfg/tests/fixtureapp/subpackage/__init__.py
@@ -0,0 +1 @@
+#package
diff --git a/repoze/bfg/tests/fixtureapp/subpackage/yetanother.zcml b/repoze/bfg/tests/fixtureapp/subpackage/yetanother.zcml
new file mode 100644
index 000000000..464163477
--- /dev/null
+++ b/repoze/bfg/tests/fixtureapp/subpackage/yetanother.zcml
@@ -0,0 +1,8 @@
+<configure xmlns="http://namespaces.repoze.org/bfg">
+
+  <include package="repoze.bfg.includes" />
+
+  <include package="repoze.bfg.tests.fixtureapp" file="another.zcml"/>
+
+</configure>
+
diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index cd88f8971..e3b200c57 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -703,6 +703,19 @@ class MakeAppTests(unittest.TestCase):
         self.assertEqual(app.registry.__name__, 'repoze.bfg.tests.fixtureapp')
         from repoze.bfg.tests.fixtureapp.models import IFixture
         self.failIf(app.registry.queryUtility(IFixture)) # only in c.zcml
+
+    def test_fixtureapp_explicit_specification_in_options(self):
+        manager = DummyRegistryManager()
+        rootpolicy = DummyRootFactory(None)
+        from repoze.bfg.tests import fixtureapp
+        zcmlfile = 'repoze.bfg.tests.fixtureapp.subpackage:yetanother.zcml'
+        app = self._callFUT(rootpolicy, fixtureapp, filename='configure.zcml',
+                            options={'configure_zcml':zcmlfile},
+                            manager=manager)
+        self.assertEqual(app.registry.__name__,
+                         'repoze.bfg.tests.fixtureapp.subpackage')
+        from repoze.bfg.tests.fixtureapp.models import IFixture
+        self.failIf(app.registry.queryUtility(IFixture)) # only in c.zcml
         
     def test_event(self):
         manager = DummyRegistryManager()