merge revisions 79609 through 79710 from

branches/benji-reduce-testing-dependencies and tweak rudimentary "real" tests
to match; the next step is to get the "real" testbrowser to run README.txt

README.txt

@@ -1,10 +1,16 @@
 Overview
 ========
 
-``zope.testbrowser`` provides an easy-to-use programmable web browser
-with special focus on testing.  It is used in Zope, but it's not Zope
-specific at all.  For instance, it can be used to test or otherwise
-interact with any web site.
+The zope.testbrowser package provides web user agents (browsers) with
+programmatic interfaces designed to be used for testing web applications,
+especially in conjunction with doctests.  This project originates in the Zope 3
+community, but is not Zope-specific.
+
+There are currently three type of testbrowser provided.  One for accessing web
+sites via HTTP (zope.testbrowser.browser), one for directly accessing a Zope 3
+application (zope.testbrowser.testing), and one that controls a Firefox web
+browser (zope.testbrowser.real).
+
 
 Changes
 =======

buildout.cfg

@@ -1,29 +1,35 @@
 [buildout]
 develop = .
-parts = test
+parts = test-zope test-no-zope
 versions = versions
 find-links = http://download.zope.org/distribution/
+index = http://download.zope.org/ppix/
 
-[test]
+[test-zope]
 recipe = zc.recipe.testrunner
-defaults = ['--tests-pattern', '^f?tests$']
-eggs = zope.testbrowser [test]
+defaults = ['--tests-pattern', '^zopetests$', '-1', '--auto-color']
+eggs = zope.testbrowser [zope]
+
+[test-no-zope]
+recipe = zc.recipe.testrunner
+defaults = ['-1', '--auto-color']
+eggs = zope.testbrowser
 
 [versions]
 ClientForm = 0.2.7
 RestrictedPython = 3.4.2
-ZConfig = 2.4a6
+ZConfig = 2.5
 ZODB3 = 3.9.0-dev-r77011
 docutils = 0.4
 mechanize = 0.1.7b
 pytz = 2007f
-setuptools = 0.6c6
+setuptools = 0.6c7
 zc.buildout = 1.0.0b30
 zc.recipe.egg = 1.0.0b6
 zc.recipe.testrunner = 1.0.0b8
 zdaemon = 2.0.0
 zodbcode = 3.4.0b1dev-r75670
-zope.annotation = 3.4.0b1.dev-r75758
+zope.annotation = 3.4.0
 zope.app.applicationcontrol = 3.4-dev-r73715
 zope.app.appsetup = 3.4.0a1
 zope.app.authentication = 3.4.0b1
@@ -54,14 +60,14 @@ zope.app.security = 3.4.0a1-1
 zope.app.securitypolicy = 3.4.0a1
 zope.app.session = 3.5.0dev-r77333
 zope.app.testing = 3.4.0b1-r78707
-zope.app.wsgi = 3.4.0b1dev-r75415
+zope.app.wsgi = 3.4.0
 zope.app.zapi = 3.4.0a1
 zope.app.zcmlfiles = 3.4.0a1
 zope.app.zopeappgenerations = 3.4.0a1
-zope.cachedescriptors = 3.4.0b1-r75830
+zope.cachedescriptors = 3.4.0
 zope.component = 3.4.0a1
 zope.configuration = 3.4.0b1
-zope.contenttype = 3.4.0a1
+zope.contenttype = 3.4.0
 zope.copypastemove = 3.4.0a1
 zope.datetime = 3.4.0
 zope.deferredimport = 3.4.0
@@ -76,7 +82,7 @@ zope.hookable = 3.4.0
 zope.i18n = 3.4.0b5.dev-r78840
 zope.i18nmessageid = 3.4.0
 zope.interface = 3.4.0
-zope.lifecycleevent = 3.4.0a1
+zope.lifecycleevent = 3.4.0
 zope.location = 3.4.0b2
 zope.minmax = 1.0b1
 zope.modulealias = 3.4.0a1
@@ -86,7 +92,7 @@ zope.publisher = 3.5.0a1.dev-r78838
 zope.schema = 3.4.0b1dev-r77624
 zope.security = 3.4.0b5
 zope.size = 3.4.0
-zope.structuredtext = 3.4.0a1
+zope.structuredtext = 3.4.0
 zope.tal = 3.4.0b1
 zope.tales = 3.4.0a1
 zope.testing = 3.5.1

setup.py

@@ -30,7 +30,8 @@
     version = '3.4.2dev',
     url = 'http://pypi.python.org/pypi/zope.testbrowser',
     license = 'ZPL 2.1',
-    description = 'Programmable browser for functional black-box tests',
+    description = 'Programmable browser for functional black-box tests'
+        ' (not Zope-specific)',
     author = 'Zope Corporation and Contributors',
     author_email = 'zope3-dev@zope.org',
     long_description = long_description,
@@ -46,19 +47,23 @@
     package_dir = {'': 'src'},
     namespace_packages = ['zope',],
     tests_require = ['zope.testing'],
-    install_requires = ['setuptools',
-                        'mechanize',
-                        'ClientForm',
-                        'simplejson'],
+    install_requires = [
+        'ClientForm',
+        'mechanize',
+        'setuptools',
+        'simplejson',
+        '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.component',
+            'zope.app.folder',
+            'zope.app.securitypolicy',
+            'zope.app.testing',
+            'zope.app.testing',
+            'zope.app.zcmlfiles',
+            ],
         ),
     include_package_data = True,
     zip_safe = False,