pin versions to ZTK and fix the tests for those versions

Note that I pinned the ZTK to specific revisions until there is a release
zopefoundation · Mar 24, 2010 · 371acea · 371acea
1 parent 1961cc4
commit 371acea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,7 +1,13 @@
 [buildout]
+extends =
+    http://svn.zope.org/repos/main/zopetoolkit/trunk/ztk.cfg?p=109981
+    http://svn.zope.org/repos/main/zopetoolkit/trunk/zopeapp.cfg?p=109918
 develop = .
 parts = test pydev
 
+[versions]
+zc.resourcelibrary =
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = zc.resourcelibrary [test]

diff --git a/src/zc/resourcelibrary/tests/ftesting.zcml b/src/zc/resourcelibrary/tests/ftesting.zcml
@@ -17,7 +17,7 @@
       title="Unauthenticated User" />
 
 
-  <include package="zope.app.securitypolicy" file="meta.zcml"/>
+  <include package="zope.securitypolicy" file="meta.zcml"/>
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

diff --git a/src/zc/resourcelibrary/tests/test_unit.py b/src/zc/resourcelibrary/tests/test_unit.py
@@ -1,6 +1,5 @@
 import doctest
 import unittest
-from zope.testing.doctestunit import DocTestSuite
 
 from zc.resourcelibrary import resourcelibrary
 from zc.resourcelibrary.resourcelibrary import LibraryInfo
@@ -65,8 +64,8 @@ def doctest_dependency_resolution():
 def test_suite():
     return unittest.TestSuite(
         (
-        DocTestSuite(setUp=setUp, tearDown=tearDown),
-        DocTestSuite('zc.resourcelibrary.publication',
+        doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
+        doctest.DocTestSuite('zc.resourcelibrary.publication',
                      optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
                      ),
         ))