[Checkins] SVN: zope.testrunner/trunk/ Changed all mentions of zope.testing to zope.testrunner, even where it doesn't have to be. zope.testing is now only a test_requirement.
Lennart Regebro
regebro at gmail.com
Fri Apr 30 13:03:56 EDT 2010
Log message for revision 111648:
Changed all mentions of zope.testing to zope.testrunner, even where it doesn't have to be. zope.testing is now only a test_requirement.
Changed:
U zope.testrunner/trunk/README.txt
U zope.testrunner/trunk/setup.py
U zope.testrunner/trunk/src/zope/testrunner/_doctest.py
U zope.testrunner/trunk/src/zope/testrunner/eggsupport.py
U zope.testrunner/trunk/src/zope/testrunner/exceptions.py
U zope.testrunner/trunk/src/zope/testrunner/formatter.py
U zope.testrunner/trunk/src/zope/testrunner/options.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests_i.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
-=-
Modified: zope.testrunner/trunk/README.txt
===================================================================
--- zope.testrunner/trunk/README.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/README.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -10,7 +10,7 @@
Getting started
***************
-zope.testing uses buildout. To start, run ``python bootstrap.py``. It will
+zope.testrunner uses buildout. To start, run ``python bootstrap.py``. It will
create a number of directories and the ``bin/buildout`` script. Next, run
``bin/buildout``. It will create a test script for you. Now, run ``bin/test``
-to run the zope.testing test suite.
+to run the zope.testrunner test suite.
Modified: zope.testrunner/trunk/setup.py
===================================================================
--- zope.testrunner/trunk/setup.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/setup.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -73,7 +73,7 @@
from setuptools.command.test import test
class custom_test(test):
- # The zope.testing tests MUST be run using it's own testrunner. This is
+ # The zope.testrunner tests MUST be run using it's own testrunner. This is
# because it's subprocess testing will call the script it was run with. We
# therefore create a script to run the testrunner, and call that.
def run(self):
@@ -172,8 +172,8 @@
namespace_packages=['zope',],
install_requires = ['setuptools',
'zope.exceptions',
- 'zope.interface',
- 'zope.testing',],
+ 'zope.interface',],
+ tests_requires = ['zope.testing',],
entry_points = {
'console_scripts':
['zope-testrunner = zope.testrunner:run',]},
Modified: zope.testrunner/trunk/src/zope/testrunner/_doctest.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/_doctest.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/_doctest.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -54,5 +54,5 @@
doctest.set_unittest_reportflags(self.old_reporting_flags)
# Use a special exception for the test runner.
-from zope.testing.exceptions import DocTestFailureException
+from zope.testrunner.exceptions import DocTestFailureException
doctest.DocTestCase.failureException = DocTestFailureException
Modified: zope.testrunner/trunk/src/zope/testrunner/eggsupport.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/eggsupport.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/eggsupport.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -31,14 +31,14 @@
o To run layer-dependent tests, use 'setup.py ftest' (see below for
adding the command to your setup.py).
- o To use this loader your pacakge add the following your 'setup()'
+ o To use this loader your package add the following your 'setup()'
call::
setup(
...
setup_requires=['eggtestinfo' # captures testing metadata in EGG-INFO
],
- tests_require=['zope.testing >= 3.6.1dev', #XXX fix version at release
+ tests_require=['zope.testrunner',
],
...
test_loader='zope.testrunner.eggsupport:SkipLayers',
@@ -59,7 +59,7 @@
o Note that this command runs *all* tests (unit *and* functional).
o This command does not provide any of the configuration options which
- the usual testrunner provided by 'zope.testing' offers: it is intended
+ the usual testrunner provided by 'zope.testrunner' offers: it is intended
to allow easy verification that a package has been installed correctly
via setuptools, but is not likely to be useful for developers working
on the package.
@@ -73,7 +73,7 @@
setup(
...
- setup_requires=['zope.testing >= 3.6.1dev', #XXX fix version at release
+ setup_requires=['zope.testrunner',
'eggtestinfo' # captures testing metadata in EGG-INFO
],
...
Modified: zope.testrunner/trunk/src/zope/testrunner/exceptions.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/exceptions.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/exceptions.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Exceptions for zope.testing
+"""Exceptions for zope.testrunner
$Id$
"""
Modified: zope.testrunner/trunk/src/zope/testrunner/formatter.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/formatter.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/formatter.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -25,7 +25,7 @@
from datetime import datetime, timedelta
-from zope.testing.exceptions import DocTestFailureException
+from zope.testrunner.exceptions import DocTestFailureException
doctest_template = """
File "%s", line %s, in %s
@@ -671,7 +671,7 @@
return self._id
-# Conditional imports, we don't want zope.testing to have a hard dependency on
+# Conditional imports, we don't want zope.testrunner to have a hard dependency on
# subunit.
try:
import subunit
Modified: zope.testrunner/trunk/src/zope/testrunner/options.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/options.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/options.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -556,7 +556,7 @@
options.original_testrunner_args = args
if options.showversion:
- dist = pkg_resources.require('zope.testing')[0]
+ dist = pkg_resources.require('zope.testrunner')[0]
print 'zope.app.testrunner version %s' % dist.version
options.fail = True
return options
@@ -670,28 +670,28 @@
def normalize_package(package, package_map={}):
r"""Normalize package name passed to the --package option.
- >>> normalize_package('zope.testing')
- 'zope.testing'
+ >>> normalize_package('zope.testrunner')
+ 'zope.testrunner'
Converts path names into package names for compatibility with the old
test runner.
- >>> normalize_package('zope/testing')
- 'zope.testing'
- >>> normalize_package('zope/testing/')
- 'zope.testing'
- >>> normalize_package('zope\\testing')
- 'zope.testing'
+ >>> normalize_package('zope/testrunner')
+ 'zope.testrunner'
+ >>> normalize_package('zope/testrunner/')
+ 'zope.testrunner'
+ >>> normalize_package('zope\\testrunner')
+ 'zope.testrunner'
Can use a map of absolute pathnames to package names
>>> a = os.path.abspath
- >>> normalize_package('src/zope/testing/',
+ >>> normalize_package('src/zope/testrunner/',
... {a('src'): ''})
- 'zope.testing'
- >>> normalize_package('src/zope_testing/',
- ... {a('src/zope_testing'): 'zope.testing'})
- 'zope.testing'
+ 'zope.testrunner'
+ >>> normalize_package('src/zope_testrunner/',
+ ... {a('src/zope_testrunner'): 'zope.testrunner'})
+ 'zope.testrunner'
>>> normalize_package('src/zope_something/tests',
... {a('src/zope_something'): 'zope.something',
... a('src'): ''})
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -52,7 +52,7 @@
test_x0 (sample1.sampletests.test111)
test_y0 (sample1.sampletests.test111)
test_z1 (sample1.sampletests.test111)
- /home/benji/workspace/zope.testing/1/src/zope/testing/testrunner/testrunner-ex/sample1/sampletests/../../sampletestsl.txt
+ /home/benji/workspace/zope.testrunner/1/src/zope/testing/testrunner/testrunner-ex/sample1/sampletests/../../sampletestsl.txt
test_x1 (sampletests.test111.TestA)
test_y0 (sampletests.test111.TestA)
test_z0 (sampletests.test111.TestA)
@@ -65,5 +65,5 @@
test_x0 (sampletests.test111)
test_y0 (sampletests.test111)
test_z1 (sampletests.test111)
- /home/benji/workspace/zope.testing/1/src/zope/testing/testrunner/testrunner-ex/sampletests/../sampletestsl.txt
+ /home/benji/workspace/zope.testrunner/1/src/zope/testing/testrunner/testrunner-ex/sampletests/../sampletestsl.txt
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -381,7 +381,7 @@
Running zope.testrunner.layer.UnitTests tests:...
<BLANKLINE>
<BLANKLINE>
- Error in test /home/jim/z3/zope.testing/src/zope/testing/testrunner-ex/sample3/post_mortem_failure.txt
+ Error in test /home/jim/z3/zope.testrunner/src/zope/testing/testrunner-ex/sample3/post_mortem_failure.txt
<BLANKLINE>
File "testrunner-ex/sample3/post_mortem_failure.txt",
line 2, in post_mortem_failure.txt
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -712,7 +712,7 @@
If there are errors when importing a test module, these errors are
reported. In order to illustrate a module with a syntax error, we create
one now: this module used to be checked in to the project, but then it was
-included in distributions of projects using zope.testing too, and distutils
+included in distributions of projects using zope.testrunner too, and distutils
complained about the syntax error when it compiled Python files during
installation of such projects. So first we create a module with bad syntax:
@@ -743,7 +743,7 @@
<BLANKLINE>
Traceback (most recent call last):
File "testrunner-ex/sample2/sample21/sampletests_i.py", line 15, in ?
- import zope.testing.huh
+ import zope.testrunner.huh
ImportError: No module named huh
<BLANKLINE>
<BLANKLINE>
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests_i.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests_i.py 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests_i.py 2010-04-30 17:03:55 UTC (rev 111648)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-import zope.testing.huh
+import zope.testrunner.huh
class Test(unittest.TestCase):
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -98,9 +98,9 @@
>>> from zope.testrunner import options
>>> from zope.testing.loggingsupport import InstalledHandler
>>> import logging
->>> log_handler = InstalledHandler('zope.testing.tests')
+>>> log_handler = InstalledHandler('zope.testrunner.tests')
>>> def log(msg):
-... logging.getLogger('zope.testing.tests').info(msg)
+... logging.getLogger('zope.testrunner.tests').info(msg)
>>> def fresh_options():
... opts = options.get_options(['--test-filter', '.*'])
... opts.resume_layer = None
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt 2010-04-30 16:58:39 UTC (rev 111647)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt 2010-04-30 17:03:55 UTC (rev 111648)
@@ -236,21 +236,21 @@
4B6\r
<BLANKLINE>
Failed doctest test for sample2.sampletests_e.eek
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 29, in eek
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 29, in eek
<BLANKLINE>
----------------------------------------------------------------------
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 31, in sample2.sampletests_e.eek
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 31, in sample2.sampletests_e.eek
Failed example:
f()
Exception raised:
Traceback (most recent call last):
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
compileflags, 1) in test.globs
File "<doctest sample2.sampletests_e.eek[0]>", line 1, in <module>
f()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 19, in f
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 19, in f
g()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 25, in g
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 25, in g
x = y + 1
- __traceback_info__: I don't know what Y should be.
NameError: global name 'y' is not defined
@@ -270,11 +270,11 @@
Traceback (most recent call last):
File "/usr/lib/python2.6/unittest.py", line 279, in run
testMethod()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 44, in test3
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 44, in test3
f()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 19, in f
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 19, in f
g()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 25, in g
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/sampletests_e.py", line 25, in g
x = y + 1
- __traceback_info__: I don't know what Y should be.
NameError: global name 'y' is not defined
@@ -293,15 +293,15 @@
329\r
<BLANKLINE>
Failed doctest test for e.txt
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/e.txt", line 0
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/e.txt", line 0
<BLANKLINE>
----------------------------------------------------------------------
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/e.txt", line 4, in e.txt
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample2/e.txt", line 4, in e.txt
Failed example:
f()
Exception raised:
Traceback (most recent call last):
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/doctest/__init__.py", line 1355, in __run
compileflags, 1) in test.globs
File "<doctest e.txt[1]>", line 1, in <module>
f()
@@ -393,7 +393,7 @@
error: sample2.sample21.sampletests_i [
Traceback (most recent call last):
testrunner-ex/sample2/sample21/sampletests_i.py", Line NNN, in ?
- import zope.testing.huh
+ import zope.testrunner.huh
ImportError: No module named huh
]
test: sample2.sample23.sampletests_i
@@ -596,7 +596,7 @@
Traceback (most recent call last):
File "/usr/lib/python2.6/unittest.py", line 305, in debug
getattr(self, self._testMethodName)()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 42, in test_error1
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 42, in test_error1
raise TypeError("Can we see errors")
TypeError: Can we see errors
0\r
@@ -614,7 +614,7 @@
Traceback (most recent call last):
File "/usr/lib/python2.6/unittest.py", line 305, in debug
getattr(self, self._testMethodName)()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 45, in test_error2
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 45, in test_error2
raise TypeError("I hope so")
TypeError: I hope so
0\r
@@ -632,7 +632,7 @@
Traceback (most recent call last):
File "/usr/lib/python2.6/unittest.py", line 305, in debug
getattr(self, self._testMethodName)()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 48, in test_fail1
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 48, in test_fail1
self.assertEqual(1, 2)
File "/usr/lib/python2.6/unittest.py", line 350, in failUnlessEqual
(msg or '%r != %r' % (first, second))
@@ -652,7 +652,7 @@
Traceback (most recent call last):
File "/usr/lib/python2.6/unittest.py", line 305, in debug
getattr(self, self._testMethodName)()
- File "/home/jml/src/zope.testing/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 51, in test_fail2
+ File "/home/jml/src/zope.testrunner/subunit-output-formatter/src/zope/testing/testrunner/testrunner-ex/sample3/sampletests_ntd.py", line 51, in test_fail2
self.assertEqual(1, 3)
File "/usr/lib/python2.6/unittest.py", line 350, in failUnlessEqual
(msg or '%r != %r' % (first, second))
More information about the checkins
mailing list