summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-29 03:16:10 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-29 03:16:10 +0000
commit6cc96689989a7781f1da4ae05b0fbc38e6c8fdb9 (patch)
treeaf261e74583d89393af8eb43421e7ce007785ff6 /repoze/bfg/tests
parent2869fc2f7f8fa9a4230d66859f232fe2e764103f (diff)
downloadpyramid-6cc96689989a7781f1da4ae05b0fbc38e6c8fdb9.tar.gz
pyramid-6cc96689989a7781f1da4ae05b0fbc38e6c8fdb9.tar.bz2
pyramid-6cc96689989a7781f1da4ae05b0fbc38e6c8fdb9.zip
Add changelog entry for resource directive.
Rejigger error detection ordering.
Diffstat (limited to 'repoze/bfg/tests')
-rw-r--r--repoze/bfg/tests/test_zcml.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 875628f5f..a8eec3d48 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -864,12 +864,14 @@ class TestResourceDirective(unittest.TestCase):
def test_override_directory_with_file(self):
from zope.configuration.exceptions import ConfigurationError
context = DummyContext()
- self.assertRaises(ConfigurationError, self._callFUT, context, 'a/', 'a')
+ self.assertRaises(ConfigurationError, self._callFUT, context,
+ 'a:foo/', 'a:foo.pt')
def test_override_file_with_directory(self):
from zope.configuration.exceptions import ConfigurationError
context = DummyContext()
- self.assertRaises(ConfigurationError, self._callFUT, context, 'a', 'a/')
+ self.assertRaises(ConfigurationError, self._callFUT, context,
+ 'a:foo.pt', 'a:foo/')
def test_no_colons(self):
from repoze.bfg.zcml import _override