[Checkins] SVN: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/ Fix a test that contains an absolute file name.
Gediminas Paulauskas
menesis at pov.lt
Tue Jan 3 16:06:00 UTC 2012
Log message for revision 123932:
Fix a test that contains an absolute file name.
Changed:
U zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/duplicate_declarations.txt
U zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py
-=-
Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/duplicate_declarations.txt
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/duplicate_declarations.txt 2012-01-03 15:23:47 UTC (rev 123931)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/duplicate_declarations.txt 2012-01-03 16:05:59 UTC (rev 123932)
@@ -19,12 +19,11 @@
... </configure>
... """)
Traceback (most recent call last):
- ...
- ZopeXMLConfigurationError: File "<string>", line 6.2-8.50
- ZopeXMLConfigurationError: File "/Users/jinty/src/zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/duplicate_declarations_overrides.zcml", line 5.2-10.2
+ ...
+ ZopeXMLConfigurationError:...
NotImplementedError: Can't cope with 2 different registrations of the same library: some-library ([], []) ([], [u'1.js'])
-This is what getIncluded woudl have returned if the above had not errored (it
+This is what getIncluded would have returned if the above had not errored (it
is wrong as includeOverrides should have take precedence):
>>> from zc.resourcelibrary import getIncluded
Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py 2012-01-03 15:23:47 UTC (rev 123931)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py 2012-01-03 16:05:59 UTC (rev 123932)
@@ -20,7 +20,6 @@
from zc.resourcelibrary import tal
from zope.app.testing import functional
from zope.configuration import xmlconfig
-from zope.component import getGlobalSiteManager
import zope.interface
from zope.pagetemplate import pagetemplate
import zope.publisher.interfaces.browser
@@ -131,7 +130,7 @@
'duplicate_declarations.txt',
'localsite.txt',
globs={'zcml': zcml, 'zpt': zpt},
- optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
)
suite.layer = ResourceLibraryFunctionalLayer
return unittest.TestSuite((
More information about the checkins
mailing list