[Checkins] SVN: zope.testbrowser/branches/benji-reduce-testing-dependencies/ experement with makeing a "zope" extra that includes all the stuff to interface

[Benji York]

Log message for revision 79613:
  experement with makeing a "zope" extra that includes all the stuff to interface
  to Zope 3's functional testing infrastructure
  

Changed:
  U   zope.testbrowser/branches/benji-reduce-testing-dependencies/buildout.cfg
  U   zope.testbrowser/branches/benji-reduce-testing-dependencies/setup.py
  U   zope.testbrowser/branches/benji-reduce-testing-dependencies/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/branches/benji-reduce-testing-dependencies/buildout.cfg
===================================================================
--- zope.testbrowser/branches/benji-reduce-testing-dependencies/buildout.cfg	2007-09-13 10:09:05 UTC (rev 79612)
+++ zope.testbrowser/branches/benji-reduce-testing-dependencies/buildout.cfg	2007-09-13 10:25:27 UTC (rev 79613)
@@ -7,7 +7,7 @@
 [test]
 recipe = zc.recipe.testrunner
 defaults = ['--tests-pattern', '^f?tests$']
-eggs = zope.testbrowser [test]
+eggs = zope.testbrowser [zope]
 
 [versions]
 ClientForm = 0.2.7

Modified: zope.testbrowser/branches/benji-reduce-testing-dependencies/setup.py
===================================================================
--- zope.testbrowser/branches/benji-reduce-testing-dependencies/setup.py	2007-09-13 10:09:05 UTC (rev 79612)
+++ zope.testbrowser/branches/benji-reduce-testing-dependencies/setup.py	2007-09-13 10:25:27 UTC (rev 79613)
@@ -46,18 +46,22 @@
     package_dir = {'': 'src'},
     namespace_packages = ['zope',],
     tests_require = ['zope.testing'],
-    install_requires = ['setuptools',
-                        'mechanize',
-                        'ClientForm'],
+    install_requires = [
+        'setuptools',
+        'mechanize',
+        'ClientForm',
+        'zope.interface',
+        'zope.schema',
+        ],
     extras_require = dict(
-        test = ['zope.interface',
-                'zope.schema',
-                'zope.app.component',
-                'zope.app.folder',
-                'zope.app.testing',
-                'zope.app.zcmlfiles',
-                'zope.app.securitypolicy',
-               ],
+        zope = [
+            'zope.app.testing',
+            'zope.app.component',
+            'zope.app.folder',
+            'zope.app.testing',
+            'zope.app.zcmlfiles',
+            'zope.app.securitypolicy',
+            ],
         ),
     include_package_data = True,
     zip_safe = False,

Modified: zope.testbrowser/branches/benji-reduce-testing-dependencies/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/benji-reduce-testing-dependencies/src/zope/testbrowser/tests.py	2007-09-13 10:09:05 UTC (rev 79612)
+++ zope.testbrowser/branches/benji-reduce-testing-dependencies/src/zope/testbrowser/tests.py	2007-09-13 10:25:27 UTC (rev 79613)
@@ -381,14 +381,12 @@
     __name__, 'TestBrowserLayer', allow_teardown=True)
 
 def test_suite():
-    from zope.testing import doctest
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     readme = FunctionalDocFileSuite('README.txt', optionflags=flags,
         checker=checker)
     readme.layer = TestBrowserLayer
-    wire = FunctionalDocFileSuite('over_the_wire.txt', optionflags=flags)
+    wire = doctest.DocFileSuite('over_the_wire.txt', optionflags=flags)
     wire.level = 2
-    wire.layer = TestBrowserLayer
     this_file = doctest.DocTestSuite(checker=checker)
     return unittest.TestSuite((this_file, readme, wire))