Commit 58229802 authored by Jim Fulton's avatar Jim Fulton

Fixed a bug that caused dependency tests to be run.

parent 8ec1c010
...@@ -24,16 +24,18 @@ To illustrate this, we'll create a pair of projects in our sample ...@@ -24,16 +24,18 @@ To illustrate this, we'll create a pair of projects in our sample
buildout: buildout:
>>> mkdir(sample_buildout, 'demo') >>> mkdir(sample_buildout, 'demo')
>>> write(sample_buildout, 'demo', 'tests.py', >>> mkdir(sample_buildout, 'demo', 'demo')
>>> write(sample_buildout, 'demo', 'demo', '__init__.py', '')
>>> write(sample_buildout, 'demo', 'demo', 'tests.py',
... ''' ... '''
... import unittest ... import unittest
... ...
... class TestSomething(unittest.TestCase): ... class TestDemo(unittest.TestCase):
... def test_something(self): ... def test(self):
... pass ... pass
... ...
... def test_suite(): ... def test_suite():
... return unittest.makeSuite(TestSomething) ... return unittest.makeSuite(TestDemo)
... ''') ... ''')
>>> write(sample_buildout, 'demo', 'setup.py', >>> write(sample_buildout, 'demo', 'setup.py',
...@@ -46,34 +48,62 @@ buildout: ...@@ -46,34 +48,62 @@ buildout:
>>> write(sample_buildout, 'demo', 'README.txt', '') >>> write(sample_buildout, 'demo', 'README.txt', '')
>>> mkdir(sample_buildout, 'demo2') >>> mkdir(sample_buildout, 'demo2')
>>> write(sample_buildout, 'demo2', 'tests.py', >>> mkdir(sample_buildout, 'demo2', 'demo2')
>>> write(sample_buildout, 'demo2', 'demo2', '__init__.py', '')
>>> write(sample_buildout, 'demo2', 'demo2', 'tests.py',
... ''' ... '''
... import unittest ... import unittest
... ...
... class TestSomething(unittest.TestCase): ... class Demo2Tests(unittest.TestCase):
... def test_something(self): ... def test2(self):
... pass ... pass
... ...
... def test_suite(): ... def test_suite():
... return unittest.makeSuite(TestSomething) ... return unittest.makeSuite(Demo2Tests)
... ''') ... ''')
>>> write(sample_buildout, 'demo2', 'setup.py', >>> write(sample_buildout, 'demo2', 'setup.py',
... """ ... """
... from setuptools import setup ... from setuptools import setup
... ...
... setup(name = "demo2") ... setup(name = "demo2", install_requires= ['demoneeded'])
... """) ... """)
>>> write(sample_buildout, 'demo2', 'README.txt', '') >>> write(sample_buildout, 'demo2', 'README.txt', '')
Demo 2 depends on demoneeded:
>>> mkdir(sample_buildout, 'demoneeded')
>>> mkdir(sample_buildout, 'demoneeded', 'demoneeded')
>>> write(sample_buildout, 'demoneeded', 'demoneeded', '__init__.py', '')
>>> write(sample_buildout, 'demoneeded', 'demoneeded', 'tests.py',
... '''
... import unittest
...
... class TestNeeded(unittest.TestCase):
... def test_needed(self):
... pass
...
... def test_suite():
... return unittest.makeSuite(TestNeeded)
... ''')
>>> write(sample_buildout, 'demoneeded', 'setup.py',
... """
... from setuptools import setup
...
... setup(name = "demoneeded")
... """)
>>> write(sample_buildout, 'demoneeded', 'README.txt', '')
We'll update our buildout to install the demo project as a We'll update our buildout to install the demo project as a
develop egg and to create the test script: develop egg and to create the test script:
>>> write(sample_buildout, 'buildout.cfg', >>> write(sample_buildout, 'buildout.cfg',
... """ ... """
... [buildout] ... [buildout]
... develop = demo demo2 ... develop = demo demoneeded demo2
... parts = testdemo ... parts = testdemo
... offline = true ... offline = true
... ...
...@@ -104,10 +134,17 @@ We get a test script installed in our bin directory: ...@@ -104,10 +134,17 @@ We get a test script installed in our bin directory:
We can run the test script to run our demo test: We can run the test script to run our demo test:
>>> print system(os.path.join(sample_buildout, 'bin', 'test')), >>> print system(os.path.join(sample_buildout, 'bin', 'test') + ' -vv'),
Running tests at level 1
Running unit tests: Running unit tests:
Running:
test (demo.tests.TestDemo)
test2 (demo2.tests.Demo2Tests)
Ran 2 tests with 0 failures and 0 errors in 0.000 seconds. Ran 2 tests with 0 failures and 0 errors in 0.000 seconds.
Note that we didn't run the demoneeded tests. Tests are only run for
the distributions listed, not for their dependencies.
If we leave the script option out of the configuration, then the test If we leave the script option out of the configuration, then the test
script will get it's name from the part: script will get it's name from the part:
......
...@@ -40,15 +40,19 @@ class TestRunner: ...@@ -40,15 +40,19 @@ class TestRunner:
requirements = [r.strip() requirements = [r.strip()
for r in options['distributions'].split('\n') for r in options['distributions'].split('\n')
if r.strip()] if r.strip()]
ws = zc.buildout.easy_install.working_set( ws = zc.buildout.easy_install.working_set(
requirements+['zope.testing'], requirements+['zope.testing'],
executable = options['executable'], executable = options['executable'],
path=[options['_d'], options['_e']] path=[options['_d'], options['_e']]
) )
path = [dist.location for dist in ws] path = [dist.location for dist in ws]
project_names = [
pkg_resources.Requirement.parse(r).project_name
for r in requirements
]
locations = [dist.location for dist in ws locations = [dist.location for dist in ws
if dist.project_name != 'zope.testing'] if dist.project_name in project_names]
script = options['script'] script = options['script']
open(script, 'w').write(tests_template % dict( open(script, 'w').write(tests_template % dict(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment